From: "Randy.Dunlap" <rddunlap@osdl.org>
remove duplicate #includes in sound/
25-akpm/sound/core/ioctl32/ioctl32.c | 1 -
25-akpm/sound/oss/forte.c | 1 -
25-akpm/sound/oss/nec_vrc5477.c | 1 -
25-akpm/sound/oss/rme96xx.c | 1 -
25-akpm/sound/oss/vwsnd.c | 2 --
5 files changed, 6 deletions(-)
diff -puN sound/core/ioctl32/ioctl32.c~sound-remove-duplicate-includes sound/core/ioctl32/ioctl32.c
--- 25/sound/core/ioctl32/ioctl32.c~sound-remove-duplicate-includes Thu Sep 4 11:10:52 2003
+++ 25-akpm/sound/core/ioctl32/ioctl32.c Thu Sep 4 11:10:52 2003
@@ -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 -puN sound/oss/forte.c~sound-remove-duplicate-includes sound/oss/forte.c
--- 25/sound/oss/forte.c~sound-remove-duplicate-includes Thu Sep 4 11:10:52 2003
+++ 25-akpm/sound/oss/forte.c Thu Sep 4 11:10:52 2003
@@ -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 -puN sound/oss/nec_vrc5477.c~sound-remove-duplicate-includes sound/oss/nec_vrc5477.c
--- 25/sound/oss/nec_vrc5477.c~sound-remove-duplicate-includes Thu Sep 4 11:10:52 2003
+++ 25-akpm/sound/oss/nec_vrc5477.c Thu Sep 4 11:10:52 2003
@@ -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 -puN sound/oss/rme96xx.c~sound-remove-duplicate-includes sound/oss/rme96xx.c
--- 25/sound/oss/rme96xx.c~sound-remove-duplicate-includes Thu Sep 4 11:10:52 2003
+++ 25-akpm/sound/oss/rme96xx.c Thu Sep 4 11:10:52 2003
@@ -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 -puN sound/oss/vwsnd.c~sound-remove-duplicate-includes sound/oss/vwsnd.c
--- 25/sound/oss/vwsnd.c~sound-remove-duplicate-includes Thu Sep 4 11:10:52 2003
+++ 25-akpm/sound/oss/vwsnd.c Thu Sep 4 11:10:52 2003
@@ -158,8 +158,6 @@
#ifdef VWSND_DEBUG
-#include <linux/interrupt.h> /* for in_interrupt() */
-
static int shut_up = 1;
/*
_