[PATCH] sound: remove duplicate includes

From: "Randy.Dunlap" <rddunlap@osdl.org>

remove duplicate #includes in sound/

diff --git a/sound/core/ioctl32/ioctl32.c b/sound/core/ioctl32/ioctl32.c
index 10c83c50d703cfa597109ae5198bbb9557216923..d927762e7c34d476e2d48ee15acd72c3f04b0e3b 100644 (file)
--- a/sound/core/ioctl32/ioctl32.c
+++ b/sound/core/ioctl32/ioctl32.c
@@ -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>

diff --git a/sound/oss/forte.c b/sound/oss/forte.c
index 606da5613e6fa6aac074dc08fa5f1c6e8cdb6538..06a31b765d4a13e0b60430f3b29d591235d60f9e 100644 (file)
--- a/sound/oss/forte.c
+++ b/sound/oss/forte.c
@@ -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 --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index d4b25a6605c730b051a315d6e2bf416ccdff21c8..cb76b797575ab06b26969e409acc59545e3e6ded 100644 (file)
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -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 --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index b6f37d51475216ad7201055f5d3d250e2536c937..c684ba956a91ff5cfc8b0f34c3c0035a165c184a 100644 (file)
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -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 --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 78fd0bc5afad4d79ab385f5c8d93343c625e55d7..b7ee3d1ae1495eab0d0d53583b9ac892b28c594f 100644 (file)
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -158,8 +158,6 @@
 
 #ifdef VWSND_DEBUG
 
-#include <linux/interrupt.h>           /* for in_interrupt() */
-
 static int shut_up = 1;
 
 /*