lkml.org 
[lkml]   [2003]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] [sound] remove duplicate includes

Hi,
Please apply to 2.6.0-current.

--
~Randy


patch_name: sound_incdups.patch
patch_version: 2003-09-03.23:31:54
author: Randy.Dunlap <rddunlap@osdl.org>
description: remove duplicate #includes in sound/
product: Linux
product_versions: 2.6.0-test4
maintainer: perex@suse.cz
diffstat: =
sound/core/ioctl32/ioctl32.c | 1 -
sound/oss/forte.c | 1 -
sound/oss/nec_vrc5477.c | 1 -
sound/oss/rme96xx.c | 1 -
sound/oss/vwsnd.c | 2 --
5 files changed, 6 deletions(-)

diff -Naurp ./sound/oss/forte.c~incdups ./sound/oss/forte.c
--- ./sound/oss/forte.c~incdups 2003-09-03 16:33:44.000000000 -0700
+++ ./sound/oss/forte.c 2003-09-03 22:07:40.000000000 -0700
@@ -37,7 +37,6 @@

#include <linux/delay.h>
#include <linux/poll.h>
-#include <linux/kernel.h>

#include <linux/sound.h>
#include <linux/ac97_codec.h>
diff -Naurp ./sound/oss/rme96xx.c~incdups ./sound/oss/rme96xx.c
--- ./sound/oss/rme96xx.c~incdups 2003-09-03 16:33:45.000000000 -0700
+++ ./sound/oss/rme96xx.c 2003-09-03 22:08:45.000000000 -0700
@@ -54,7 +54,6 @@ TODO:
#include <linux/smp_lock.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <asm/dma.h>
#include <asm/hardirq.h>
#include <linux/init.h>
#include <linux/interrupt.h>
diff -Naurp ./sound/oss/vwsnd.c~incdups ./sound/oss/vwsnd.c
--- ./sound/oss/vwsnd.c~incdups 2003-09-03 16:34:08.000000000 -0700
+++ ./sound/oss/vwsnd.c 2003-09-03 22:09:34.000000000 -0700
@@ -158,8 +158,6 @@

#ifdef VWSND_DEBUG

-#include <linux/interrupt.h> /* for in_interrupt() */
-
static int shut_up = 1;

/*
diff -Naurp ./sound/oss/nec_vrc5477.c~incdups ./sound/oss/nec_vrc5477.c
--- ./sound/oss/nec_vrc5477.c~incdups 2003-09-03 16:34:29.000000000 -0700
+++ ./sound/oss/nec_vrc5477.c 2003-09-03 22:10:34.000000000 -0700
@@ -96,7 +96,6 @@
#endif

#if defined(VRC5477_AC97_DEBUG)
-#include <linux/kernel.h>
#define ASSERT(x) if (!(x)) { \
panic("assertion failed at %s:%d: %s\n", __FILE__, __LINE__, #x); }
#else
diff -Naurp ./sound/core/ioctl32/ioctl32.c~incdups ./sound/core/ioctl32/ioctl32.c
--- ./sound/core/ioctl32/ioctl32.c~incdups 2003-09-03 16:33:23.000000000 -0700
+++ ./sound/core/ioctl32/ioctl32.c 2003-09-03 22:12:53.000000000 -0700
@@ -25,7 +25,6 @@
#include <linux/time.h>
#include <linux/slab.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <sound/core.h>
#include <sound/control.h>
#include <asm/uaccess.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.020 / U:0.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site