diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 835e320eeb4d87..b03df4d4795c67 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -394,7 +394,6 @@
Basic Flow for PCI Drivers - Example
#include
#include
#include
@@ -751,7 +750,6 @@
#include
#include
#include
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 7549939b953563..986a8365e37fb6 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -27,7 +27,6 @@
#include
#include
-#include
#include
#include
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 8735227f7e47b5..316b106c3511b2 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -33,7 +33,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index ba2531034a9126..047add8f3010ef 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -21,7 +21,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index ce450304fb5364..b88ca995fafbbd 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -38,7 +38,6 @@
#include
#include
#include
-#include
#include
#include
#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 0689189550bce6..7da7fcb05640b4 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -24,7 +24,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/include/asm-arm/arch-omap/eac.h b/include/asm-arm/arch-omap/eac.h
index 6662cb02bafc81..ccee3b0700b338 100644
--- a/include/asm-arm/arch-omap/eac.h
+++ b/include/asm-arm/arch-omap/eac.h
@@ -31,7 +31,6 @@
#include
#include
-#include
#include
/* master codec clock source */
diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/include/asm-arm/arch-omap/omap-alsa.h
index fcaf44c14714c8..faa0ed23d4bad8 100644
--- a/include/asm-arm/arch-omap/omap-alsa.h
+++ b/include/asm-arm/arch-omap/omap-alsa.h
@@ -40,7 +40,6 @@
#ifndef __OMAP_ALSA_H
#define __OMAP_ALSA_H
-#include
#include
#include
#include
diff --git a/include/asm-arm/arch-pxa/audio.h b/include/asm-arm/arch-pxa/audio.h
index 17eccd72013650..52bbe3bc25e1e5 100644
--- a/include/asm-arm/arch-pxa/audio.h
+++ b/include/asm-arm/arch-pxa/audio.h
@@ -1,7 +1,6 @@
#ifndef __ASM_ARCH_AUDIO_H__
#define __ASM_ARCH_AUDIO_H__
-#include
#include
#include
diff --git a/include/sound/core.h b/include/sound/core.h
index 6954836487ed34..4fc0235ad78433 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -22,12 +22,22 @@
*
*/
+#include
#include /* wake_up() */
#include /* struct mutex */
#include /* struct rw_semaphore */
#include /* pm_message_t */
#include
+/* number of supported soundcards */
+#ifdef CONFIG_SND_DYNAMIC_MINORS
+#define SNDRV_CARDS 32
+#else
+#define SNDRV_CARDS 8 /* don't change - minor numbers */
+#endif
+
+#define CONFIG_SND_MAJOR 116 /* standard configuration */
+
/* forward declarations */
#ifdef CONFIG_PCI
struct pci_dev;
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 1889929d18316d..f0359437d01ac8 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -1,47 +1 @@
-#ifndef __SOUND_DRIVER_H
-#define __SOUND_DRIVER_H
-
-/*
- * Main header file for the ALSA driver
- * Copyright (c) 1994-2000 by Jaroslav Kysela
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#ifdef ALSA_BUILD
-#include "config.h"
-#endif
-
-
-/* number of supported soundcards */
-#ifdef CONFIG_SND_DYNAMIC_MINORS
-#define SNDRV_CARDS 32
-#else
-#define SNDRV_CARDS 8 /* don't change - minor numbers */
-#endif
-
-#ifndef CONFIG_SND_MAJOR /* standard configuration */
-#define CONFIG_SND_MAJOR 116
-#endif
-
-#ifdef ALSA_BUILD
-#include "adriver.h"
-#endif
-
-#include
-
-#endif /* __SOUND_DRIVER_H */
+#warning "This file is deprecated"
diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index d7e33ce09120bb..a0c5febdc4ea6b 100644
--- a/include/sound/opl3.h
+++ b/include/sound/opl3.h
@@ -51,19 +51,16 @@
*
*/
-#include "driver.h"
-#include
-#include
-#include "core.h"
-#include "hwdep.h"
-#include "timer.h"
-#include "seq_midi_emul.h"
+#include
+#include
+#include
+#include
#ifdef CONFIG_SND_SEQUENCER_OSS
-#include "seq_oss.h"
-#include "seq_oss_legacy.h"
+#include
+#include
#endif
-#include "seq_device.h"
-#include "asound_fm.h"
+#include
+#include
/*
* Register numbers for the global registers
diff --git a/include/sound/soc.h b/include/sound/soc.h
index f47ef1f75f1810..c22c6565040535 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/sound/aoa/aoa.h b/sound/aoa/aoa.h
index 541b908f3cdf00..e08789484e3001 100644
--- a/sound/aoa/aoa.h
+++ b/sound/aoa/aoa.h
@@ -10,8 +10,6 @@
#define __AOA_H
#include
#include
-/* So apparently there's a reason for requiring driver.h to be included first! */
-#include
#include
#include
#include
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index efb9441b3acf2e..e6beb92c6933f9 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -11,7 +11,6 @@
#include
#include
-#include
#include
#include
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
index e6ffea9128c793..59bacd365733f8 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
@@ -8,9 +8,6 @@
#include
#include
-/* So apparently there's a reason for requiring driver.h
- * to be included first, even if I don't know it... */
-#include
#include
#include
#include
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 3b73ba7d03e85e..b0a474494966d4 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -23,7 +23,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/sound/arm/devdma.c b/sound/arm/devdma.c
index ca3bf4ee05a380..9d1e6665b546c0 100644
--- a/sound/arm/devdma.c
+++ b/sound/arm/devdma.c
@@ -12,7 +12,6 @@
#include
#include
-#include
#include
#include
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index d255503e7e077d..5d86e6809752e7 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -18,7 +18,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c
index e8cf904b835804..0ede9e4656a89c 100644
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
@@ -16,7 +16,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 81c64b09d35921..0eff33ca0f7937 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -59,7 +59,6 @@
*
***************************************************************************************************/
-#include
#include
#include
#include
diff --git a/sound/core/control.c b/sound/core/control.c
index c89ca0d1f3cee6..01a1a5af47bb77 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/device.c b/sound/core/device.c
index ea1a0621eefb66..202dac0e4d895b 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index bfd9d182b8a33a..6d6589f9389903 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/info.c b/sound/core/info.c
index 1ffd29bb4cd06c..9977ec2eace35d 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 9e8b8163bdd449..e35789a92752da 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/init.c b/sound/core/init.c
index 48d38a79cbbba4..dc06e79ca09f29 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/isadma.c b/sound/core/isadma.c
index eb173cef4f05e3..79f0f16af33930 100644
--- a/sound/core/isadma.c
+++ b/sound/core/isadma.c
@@ -26,7 +26,6 @@
#undef HAVE_REALLY_SLOW_DMA_CONTROLLER
-#include
#include
#include
diff --git a/sound/core/memory.c b/sound/core/memory.c
index 25b0f056563e79..1161158582a6ce 100644
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -20,9 +20,9 @@
*
*/
-#include
#include
#include
+#include
/**
* copy_to_user_fromio - copy data from mmio-space to user-space
diff --git a/sound/core/misc.c b/sound/core/misc.c
index 6cabab8cc53749..102d1c36cf26a6 100644
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c
index d6a04c2d5a75a7..9ded30d0e97da4 100644
--- a/sound/core/oss/copy.c
+++ b/sound/core/oss/copy.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c
index 3ece39fc48dbaf..f874f6ca365703 100644
--- a/sound/core/oss/io.c
+++ b/sound/core/oss/io.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 06f96a3e86f675..da3dbd41669eb9 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -20,7 +20,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index c5a5ab9cae8cac..75daed298a15a2 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c
index 848db82529ed26..77f96194a0eda5 100644
--- a/sound/core/oss/mulaw.c
+++ b/sound/core/oss/mulaw.c
@@ -21,7 +21,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index f7f15e39984223..092c2d84a9bc77 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -26,7 +26,6 @@
#define OSS_DEBUG
#endif
-#include
#include
#include
#include
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 14095a927a1b1b..bec94138205edf 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -24,7 +24,6 @@
#define PLUGIN_DEBUG
#endif
-#include
#include
#include
#include
diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index 9eb267913c3814..14dfb3175d8454 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index de3ffdeaf7e346..da7ab7a3e82cdd 100644
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index cf3af39c3514aa..1502acd81a185a 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index f00758c2bdedf5..ed0223ca5c552c 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -20,7 +20,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index a13e38cfd2c62f..ff07b4a9992e80 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index b9ae6b37a61f6d..89b7f549bebd77 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index d6b4e6b6108f94..e6e4aa87e57e17 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c
index 23aa9a27e2158f..033a024d153a84 100644
--- a/sound/core/pcm_timer.c
+++ b/sound/core/pcm_timer.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index b8e700b94e5962..f94694cb47f83a 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c
index 7cd5e8f5d4cebc..97b30fb4c36119 100644
--- a/sound/core/rtctimer.c
+++ b/sound/core/rtctimer.c
@@ -20,7 +20,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index bc0992398461bb..777796e9449047 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include
#include
#include
#include
diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h
index 9a8567c928ec4b..bf8d2b4cb15e8e 100644
--- a/sound/core/seq/oss/seq_oss_device.h
+++ b/sound/core/seq/oss/seq_oss_device.h
@@ -21,7 +21,6 @@
#ifndef __SEQ_OSS_DEVICE_H
#define __SEQ_OSS_DEVICE_H
-#include
#include
#include
#include
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c
index 1878208a802665..ee0f8405ab355e 100644
--- a/sound/core/seq/seq.c
+++ b/sound/core/seq/seq.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 6444bd8c0fdfe4..f97c1ba43a2820 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -21,7 +21,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index 37852cdace7609..155dc7da47222d 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -36,7 +36,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index e55488d1237ceb..f3bdc54b429a91 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -18,7 +18,6 @@
*
*/
-#include
#include
#include
#include
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
index 6b055aed7a4b23..3a94ed021bd96e 100644
--- a/sound/core/seq/seq_fifo.c
+++ b/sound/core/seq/seq_fifo.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
#include "seq_fifo.h"
diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c
index 8a7fe5cca1c900..201f8106ffdd9b 100644
--- a/sound/core/seq/seq_info.c
+++ b/sound/core/seq/seq_info.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include
#include
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c
index 1a34941d42172b..54f921edda793a 100644
--- a/sound/core/seq/seq_lock.c
+++ b/sound/core/seq/seq_lock.c
@@ -19,7 +19,6 @@
*
*/
-#include
#include