diff options
347 files changed, 20 insertions, 408 deletions
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 835e320eeb4d..b03df4d4795c 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 @@ | |||
| 394 | <title>Basic Flow for PCI Drivers - Example</title> | 394 | <title>Basic Flow for PCI Drivers - Example</title> |
| 395 | <programlisting> | 395 | <programlisting> |
| 396 | <![CDATA[ | 396 | <![CDATA[ |
| 397 | #include <sound/driver.h> | ||
| 398 | #include <linux/init.h> | 397 | #include <linux/init.h> |
| 399 | #include <linux/pci.h> | 398 | #include <linux/pci.h> |
| 400 | #include <linux/slab.h> | 399 | #include <linux/slab.h> |
| @@ -751,7 +750,6 @@ | |||
| 751 | <informalexample> | 750 | <informalexample> |
| 752 | <programlisting> | 751 | <programlisting> |
| 753 | <![CDATA[ | 752 | <![CDATA[ |
| 754 | #include <sound/driver.h> | ||
| 755 | #include <linux/init.h> | 753 | #include <linux/init.h> |
| 756 | #include <linux/pci.h> | 754 | #include <linux/pci.h> |
| 757 | #include <linux/slab.h> | 755 | #include <linux/slab.h> |
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 7549939b9535..986a8365e37f 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/kthread.h> | 27 | #include <linux/kthread.h> |
| 28 | #include <linux/freezer.h> | 28 | #include <linux/freezer.h> |
| 29 | 29 | ||
| 30 | #include <sound/driver.h> | ||
| 31 | #include <sound/core.h> | 30 | #include <sound/core.h> |
| 32 | #include <sound/ac97_codec.h> | 31 | #include <sound/ac97_codec.h> |
| 33 | 32 | ||
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index 8735227f7e47..316b106c3511 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | 34 | ||
| 35 | #include <asm/delay.h> | 35 | #include <asm/delay.h> |
| 36 | #include <sound/driver.h> | ||
| 37 | #include <sound/core.h> | 36 | #include <sound/core.h> |
| 38 | #include <sound/pcm.h> | 37 | #include <sound/pcm.h> |
| 39 | #include <sound/pcm_params.h> | 38 | #include <sound/pcm_params.h> |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index ba2531034a91..047add8f3010 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/time.h> | 21 | #include <linux/time.h> |
| 22 | #include <linux/wait.h> | 22 | #include <linux/wait.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <sound/driver.h> | ||
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 26 | #include <sound/control.h> | 25 | #include <sound/control.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index ce450304fb53..b88ca995fafb 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <media/ir-common.h> | 38 | #include <media/ir-common.h> |
| 39 | #include <media/ir-kbd-i2c.h> | 39 | #include <media/ir-kbd-i2c.h> |
| 40 | #include <media/videobuf-dma-sg.h> | 40 | #include <media/videobuf-dma-sg.h> |
| 41 | #include <sound/driver.h> | ||
| 42 | #include <sound/core.h> | 41 | #include <sound/core.h> |
| 43 | #include <sound/pcm.h> | 42 | #include <sound/pcm.h> |
| 44 | #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) | 43 | #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 0689189550bc..7da7fcb05640 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/utsname.h> | 24 | #include <linux/utsname.h> |
| 25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 29 | #include <sound/initval.h> | 28 | #include <sound/initval.h> |
| 30 | #include <sound/rawmidi.h> | 29 | #include <sound/rawmidi.h> |
diff --git a/include/asm-arm/arch-omap/eac.h b/include/asm-arm/arch-omap/eac.h index 6662cb02bafc..ccee3b0700b3 100644 --- a/include/asm-arm/arch-omap/eac.h +++ b/include/asm-arm/arch-omap/eac.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <asm/arch/hardware.h> | 31 | #include <asm/arch/hardware.h> |
| 32 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
| 33 | 33 | ||
| 34 | #include <sound/driver.h> | ||
| 35 | #include <sound/core.h> | 34 | #include <sound/core.h> |
| 36 | 35 | ||
| 37 | /* master codec clock source */ | 36 | /* 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 fcaf44c14714..faa0ed23d4ba 100644 --- a/include/asm-arm/arch-omap/omap-alsa.h +++ b/include/asm-arm/arch-omap/omap-alsa.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #ifndef __OMAP_ALSA_H | 40 | #ifndef __OMAP_ALSA_H |
| 41 | #define __OMAP_ALSA_H | 41 | #define __OMAP_ALSA_H |
| 42 | 42 | ||
| 43 | #include <sound/driver.h> | ||
| 44 | #include <asm/arch/dma.h> | 43 | #include <asm/arch/dma.h> |
| 45 | #include <sound/core.h> | 44 | #include <sound/core.h> |
| 46 | #include <sound/pcm.h> | 45 | #include <sound/pcm.h> |
diff --git a/include/asm-arm/arch-pxa/audio.h b/include/asm-arm/arch-pxa/audio.h index 17eccd720136..52bbe3bc25e1 100644 --- a/include/asm-arm/arch-pxa/audio.h +++ b/include/asm-arm/arch-pxa/audio.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_ARCH_AUDIO_H__ | 1 | #ifndef __ASM_ARCH_AUDIO_H__ |
| 2 | #define __ASM_ARCH_AUDIO_H__ | 2 | #define __ASM_ARCH_AUDIO_H__ |
| 3 | 3 | ||
| 4 | #include <sound/driver.h> | ||
| 5 | #include <sound/core.h> | 4 | #include <sound/core.h> |
| 6 | #include <sound/pcm.h> | 5 | #include <sound/pcm.h> |
| 7 | 6 | ||
diff --git a/include/sound/core.h b/include/sound/core.h index 6954836487ed..4fc0235ad784 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
| @@ -22,12 +22,22 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/module.h> | ||
| 25 | #include <linux/sched.h> /* wake_up() */ | 26 | #include <linux/sched.h> /* wake_up() */ |
| 26 | #include <linux/mutex.h> /* struct mutex */ | 27 | #include <linux/mutex.h> /* struct mutex */ |
| 27 | #include <linux/rwsem.h> /* struct rw_semaphore */ | 28 | #include <linux/rwsem.h> /* struct rw_semaphore */ |
| 28 | #include <linux/pm.h> /* pm_message_t */ | 29 | #include <linux/pm.h> /* pm_message_t */ |
| 29 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 30 | 31 | ||
| 32 | /* number of supported soundcards */ | ||
| 33 | #ifdef CONFIG_SND_DYNAMIC_MINORS | ||
| 34 | #define SNDRV_CARDS 32 | ||
| 35 | #else | ||
| 36 | #define SNDRV_CARDS 8 /* don't change - minor numbers */ | ||
| 37 | #endif | ||
| 38 | |||
| 39 | #define CONFIG_SND_MAJOR 116 /* standard configuration */ | ||
| 40 | |||
| 31 | /* forward declarations */ | 41 | /* forward declarations */ |
| 32 | #ifdef CONFIG_PCI | 42 | #ifdef CONFIG_PCI |
| 33 | struct pci_dev; | 43 | struct pci_dev; |
diff --git a/include/sound/driver.h b/include/sound/driver.h index 1889929d1831..f0359437d01a 100644 --- a/include/sound/driver.h +++ b/include/sound/driver.h | |||
| @@ -1,47 +1 @@ | |||
| 1 | #ifndef __SOUND_DRIVER_H | #warning "This file is deprecated" | |
| 2 | #define __SOUND_DRIVER_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * Main header file for the ALSA driver | ||
| 6 | * Copyright (c) 1994-2000 by Jaroslav Kysela <perex@perex.cz> | ||
| 7 | * | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | ||
| 14 | * This program is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 19 | * You should have received a copy of the GNU General Public License | ||
| 20 | * along with this program; if not, write to the Free Software | ||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 22 | * | ||
| 23 | */ | ||
| 24 | |||
| 25 | #ifdef ALSA_BUILD | ||
| 26 | #include "config.h" | ||
| 27 | #endif | ||
| 28 | |||
| 29 | |||
| 30 | /* number of supported soundcards */ | ||
| 31 | #ifdef CONFIG_SND_DYNAMIC_MINORS | ||
| 32 | #define SNDRV_CARDS 32 | ||
| 33 | #else | ||
| 34 | #define SNDRV_CARDS 8 /* don't change - minor numbers */ | ||
| 35 | #endif | ||
| 36 | |||
| 37 | #ifndef CONFIG_SND_MAJOR /* standard configuration */ | ||
| 38 | #define CONFIG_SND_MAJOR 116 | ||
| 39 | #endif | ||
| 40 | |||
| 41 | #ifdef ALSA_BUILD | ||
| 42 | #include "adriver.h" | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #include <linux/module.h> | ||
| 46 | |||
| 47 | #endif /* __SOUND_DRIVER_H */ | ||
diff --git a/include/sound/opl3.h b/include/sound/opl3.h index d7e33ce09120..a0c5febdc4ea 100644 --- a/include/sound/opl3.h +++ b/include/sound/opl3.h | |||
| @@ -51,19 +51,16 @@ | |||
| 51 | * | 51 | * |
| 52 | */ | 52 | */ |
| 53 | 53 | ||
| 54 | #include "driver.h" | 54 | #include <sound/core.h> |
| 55 | #include <linux/time.h> | 55 | #include <sound/hwdep.h> |
| 56 | #include <linux/mutex.h> | 56 | #include <sound/timer.h> |
| 57 | #include "core.h" | 57 | #include <sound/seq_midi_emul.h> |
| 58 | #include "hwdep.h" | ||
| 59 | #include "timer.h" | ||
| 60 | #include "seq_midi_emul.h" | ||
| 61 | #ifdef CONFIG_SND_SEQUENCER_OSS | 58 | #ifdef CONFIG_SND_SEQUENCER_OSS |
| 62 | #include "seq_oss.h" | 59 | #include <sound/seq_oss.h> |
| 63 | #include "seq_oss_legacy.h" | 60 | #include <sound/seq_oss_legacy.h> |
| 64 | #endif | 61 | #endif |
| 65 | #include "seq_device.h" | 62 | #include <sound/seq_device.h> |
| 66 | #include "asound_fm.h" | 63 | #include <sound/asound_fm.h> |
| 67 | 64 | ||
| 68 | /* | 65 | /* |
| 69 | * Register numbers for the global registers | 66 | * Register numbers for the global registers |
diff --git a/include/sound/soc.h b/include/sound/soc.h index f47ef1f75f18..c22c65650405 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
| 19 | #include <sound/driver.h> | ||
| 20 | #include <sound/core.h> | 19 | #include <sound/core.h> |
| 21 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
| 22 | #include <sound/control.h> | 21 | #include <sound/control.h> |
diff --git a/sound/aoa/aoa.h b/sound/aoa/aoa.h index 541b908f3cdf..e08789484e30 100644 --- a/sound/aoa/aoa.h +++ b/sound/aoa/aoa.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | #define __AOA_H | 10 | #define __AOA_H |
| 11 | #include <asm/prom.h> | 11 | #include <asm/prom.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | /* So apparently there's a reason for requiring driver.h to be included first! */ | ||
| 14 | #include <sound/driver.h> | ||
| 15 | #include <sound/core.h> | 13 | #include <sound/core.h> |
| 16 | #include <sound/asound.h> | 14 | #include <sound/asound.h> |
| 17 | #include <sound/control.h> | 15 | #include <sound/control.h> |
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c index efb9441b3acf..e6beb92c6933 100644 --- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c +++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/dma-mapping.h> | 12 | #include <linux/dma-mapping.h> |
| 13 | 13 | ||
| 14 | #include <sound/driver.h> | ||
| 15 | #include <sound/core.h> | 14 | #include <sound/core.h> |
| 16 | 15 | ||
| 17 | #include <asm/macio.h> | 16 | #include <asm/macio.h> |
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c index e6ffea9128c7..59bacd365733 100644 --- a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c +++ b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c | |||
| @@ -8,9 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #include <asm/io.h> | 9 | #include <asm/io.h> |
| 10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 11 | /* So apparently there's a reason for requiring driver.h | ||
| 12 | * to be included first, even if I don't know it... */ | ||
| 13 | #include <sound/driver.h> | ||
| 14 | #include <sound/core.h> | 11 | #include <sound/core.h> |
| 15 | #include <asm/macio.h> | 12 | #include <asm/macio.h> |
| 16 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 3b73ba7d03e8..b0a474494966 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
| 24 | #include <asm/sizes.h> | 24 | #include <asm/sizes.h> |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
| 28 | #include <sound/initval.h> | 27 | #include <sound/initval.h> |
| 29 | #include <sound/ac97_codec.h> | 28 | #include <sound/ac97_codec.h> |
diff --git a/sound/arm/devdma.c b/sound/arm/devdma.c index ca3bf4ee05a3..9d1e6665b546 100644 --- a/sound/arm/devdma.c +++ b/sound/arm/devdma.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | #include <linux/dma-mapping.h> | 13 | #include <linux/dma-mapping.h> |
| 14 | 14 | ||
| 15 | #include <sound/driver.h> | ||
| 16 | #include <sound/core.h> | 15 | #include <sound/core.h> |
| 17 | #include <sound/pcm.h> | 16 | #include <sound/pcm.h> |
| 18 | 17 | ||
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index d255503e7e07..5d86e6809752 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/wait.h> | 18 | #include <linux/wait.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <sound/core.h> | 21 | #include <sound/core.h> |
| 23 | #include <sound/pcm.h> | 22 | #include <sound/pcm.h> |
| 24 | #include <sound/ac97_codec.h> | 23 | #include <sound/ac97_codec.h> |
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index e8cf904b8358..0ede9e4656a8 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 18 | 18 | ||
| 19 | #include <sound/driver.h> | ||
| 20 | #include <sound/core.h> | 19 | #include <sound/core.h> |
| 21 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
| 22 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index 81c64b09d359..0eff33ca0f79 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | * | 59 | * |
| 60 | ***************************************************************************************************/ | 60 | ***************************************************************************************************/ |
| 61 | 61 | ||
| 62 | #include <sound/driver.h> | ||
| 63 | #include <linux/module.h> | 62 | #include <linux/module.h> |
| 64 | #include <linux/moduleparam.h> | 63 | #include <linux/moduleparam.h> |
| 65 | #include <linux/init.h> | 64 | #include <linux/init.h> |
diff --git a/sound/core/control.c b/sound/core/control.c index c89ca0d1f3ce..01a1a5af47bb 100644 --- a/sound/core/control.c +++ b/sound/core/control.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/threads.h> | 22 | #include <linux/threads.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/core/device.c b/sound/core/device.c index ea1a0621eefb..202dac0e4d89 100644 --- a/sound/core/device.c +++ b/sound/core/device.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index bfd9d182b8a3..6d6589f93899 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/major.h> | 22 | #include <linux/major.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/core/info.c b/sound/core/info.c index 1ffd29bb4cd0..9977ec2eace3 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <linux/smp_lock.h> | 24 | #include <linux/smp_lock.h> |
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c index 9e8b8163bdd4..e35789a92752 100644 --- a/sound/core/info_oss.c +++ b/sound/core/info_oss.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <linux/string.h> | 24 | #include <linux/string.h> |
diff --git a/sound/core/init.c b/sound/core/init.c index 48d38a79cbbb..dc06e79ca09f 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 25 | #include <linux/file.h> | 24 | #include <linux/file.h> |
diff --git a/sound/core/isadma.c b/sound/core/isadma.c index eb173cef4f05..79f0f16af339 100644 --- a/sound/core/isadma.c +++ b/sound/core/isadma.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #undef HAVE_REALLY_SLOW_DMA_CONTROLLER | 27 | #undef HAVE_REALLY_SLOW_DMA_CONTROLLER |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
| 31 | #include <asm/dma.h> | 30 | #include <asm/dma.h> |
| 32 | 31 | ||
diff --git a/sound/core/memory.c b/sound/core/memory.c index 25b0f056563e..1161158582a6 100644 --- a/sound/core/memory.c +++ b/sound/core/memory.c | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/module.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 25 | #include <sound/core.h> | ||
| 26 | 26 | ||
| 27 | /** | 27 | /** |
| 28 | * copy_to_user_fromio - copy data from mmio-space to user-space | 28 | * 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 6cabab8cc537..102d1c36cf26 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c index d6a04c2d5a75..9ded30d0e97d 100644 --- a/sound/core/oss/copy.c +++ b/sound/core/oss/copy.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c index 3ece39fc48db..f874f6ca3657 100644 --- a/sound/core/oss/io.c +++ b/sound/core/oss/io.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c index 06f96a3e86f6..da3dbd41669e 100644 --- a/sound/core/oss/linear.c +++ b/sound/core/oss/linear.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 26 | #include <sound/pcm.h> | 25 | #include <sound/pcm.h> |
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index c5a5ab9cae8c..75daed298a15 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c index 848db82529ed..77f96194a0ed 100644 --- a/sound/core/oss/mulaw.c +++ b/sound/core/oss/mulaw.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index f7f15e399842..092c2d84a9bc 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #define OSS_DEBUG | 26 | #define OSS_DEBUG |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 32 | #include <linux/time.h> | 31 | #include <linux/time.h> |
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c index 14095a927a1b..bec94138205e 100644 --- a/sound/core/oss/pcm_plugin.c +++ b/sound/core/oss/pcm_plugin.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #define PLUGIN_DEBUG | 24 | #define PLUGIN_DEBUG |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 29 | #include <linux/time.h> | 28 | #include <linux/time.h> |
| 30 | #include <linux/vmalloc.h> | 29 | #include <linux/vmalloc.h> |
diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c index 9eb267913c38..14dfb3175d84 100644 --- a/sound/core/oss/rate.c +++ b/sound/core/oss/rate.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c index de3ffdeaf7e3..da7ab7a3e82c 100644 --- a/sound/core/oss/route.c +++ b/sound/core/oss/route.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index cf3af39c3514..1502acd81a18 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index f00758c2bded..ed0223ca5c55 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index a13e38cfd2c6..ff07b4a9992e 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c index b9ae6b37a61f..89b7f549bebd 100644 --- a/sound/core/pcm_misc.c +++ b/sound/core/pcm_misc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index d6b4e6b6108f..e6e4aa87e57e 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/file.h> | 23 | #include <linux/file.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c index 23aa9a27e215..033a024d153a 100644 --- a/sound/core/pcm_timer.c +++ b/sound/core/pcm_timer.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index b8e700b94e59..f94694cb47f8 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <linux/major.h> | 23 | #include <linux/major.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c index 7cd5e8f5d4ce..97b30fb4c361 100644 --- a/sound/core/rtctimer.c +++ b/sound/core/rtctimer.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 26 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index bc0992398461..777796e94490 100644 --- a/sound/core/seq/oss/seq_oss.c +++ b/sound/core/seq/oss/seq_oss.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 26 | #include <linux/mutex.h> | 25 | #include <linux/mutex.h> |
diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h index 9a8567c928ec..bf8d2b4cb15e 100644 --- a/sound/core/seq/oss/seq_oss_device.h +++ b/sound/core/seq/oss/seq_oss_device.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #ifndef __SEQ_OSS_DEVICE_H | 21 | #ifndef __SEQ_OSS_DEVICE_H |
| 22 | #define __SEQ_OSS_DEVICE_H | 22 | #define __SEQ_OSS_DEVICE_H |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c index 1878208a8026..ee0f8405ab35 100644 --- a/sound/core/seq/seq.c +++ b/sound/core/seq/seq.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 6444bd8c0fdf..f97c1ba43a28 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c index 37852cdace76..155dc7da4722 100644 --- a/sound/core/seq/seq_device.c +++ b/sound/core/seq/seq_device.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * | 36 | * |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <sound/driver.h> | ||
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <sound/core.h> | 40 | #include <sound/core.h> |
| 42 | #include <sound/info.h> | 41 | #include <sound/info.h> |
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c index e55488d1237c..f3bdc54b429a 100644 --- a/sound/core/seq/seq_dummy.c +++ b/sound/core/seq/seq_dummy.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c index 6b055aed7a4b..3a94ed021bd9 100644 --- a/sound/core/seq/seq_fifo.c +++ b/sound/core/seq/seq_fifo.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include "seq_fifo.h" | 24 | #include "seq_fifo.h" |
diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c index 8a7fe5cca1c9..201f8106ffdd 100644 --- a/sound/core/seq/seq_info.c +++ b/sound/core/seq/seq_info.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | 24 | ||
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c index 1a34941d4217..54f921edda79 100644 --- a/sound/core/seq/seq_lock.c +++ b/sound/core/seq/seq_lock.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include "seq_lock.h" | 23 | #include "seq_lock.h" |
| 25 | 24 | ||
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index a72a1945bf8a..0cf6ac477318 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c index 5929aaf1df9d..99b35360c506 100644 --- a/sound/core/seq/seq_midi.c +++ b/sound/core/seq/seq_midi.c | |||
| @@ -26,7 +26,6 @@ Possible options for midisynth module: | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c index 6645fc544621..07c663135c62 100644 --- a/sound/core/seq/seq_midi_emul.c +++ b/sound/core/seq/seq_midi_emul.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * code in here. If there is it should be reported as a bug. | 29 | * code in here. If there is it should be reported as a bug. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <sound/driver.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
| 35 | #include <linux/string.h> | 34 | #include <linux/string.h> |
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c index b6820a5a73fc..8284f176a342 100644 --- a/sound/core/seq/seq_midi_event.c +++ b/sound/core/seq/seq_midi_event.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 25 | #include <linux/string.h> | 24 | #include <linux/string.h> |
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index b6e23ad12ab9..1c32a53d6bd8 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include "seq_system.h" | 25 | #include "seq_system.h" |
diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c index 074418617ee9..85969db576c9 100644 --- a/sound/core/seq/seq_prioq.c +++ b/sound/core/seq/seq_prioq.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index 9b87bb0c7f33..4a48c6ee8ee8 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * - Addition of experimental sync support. | 35 | * - Addition of experimental sync support. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <sound/driver.h> | ||
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
| 41 | #include <sound/core.h> | 40 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c index b201b76e9412..77884e62b648 100644 --- a/sound/core/seq/seq_system.c +++ b/sound/core/seq/seq_system.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include "seq_system.h" | 24 | #include "seq_system.h" |
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index 82a5b333a963..d8fcd62e400f 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include "seq_timer.h" | 25 | #include "seq_timer.h" |
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index e11790f6debe..86e7739269ca 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * | 35 | * |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <sound/driver.h> | ||
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/wait.h> | 39 | #include <linux/wait.h> |
| 41 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
diff --git a/sound/core/sound.c b/sound/core/sound.c index 7b486c4d70db..00cca4d6e562 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c index dc73313b733a..7be51546eb9e 100644 --- a/sound/core/sound_oss.c +++ b/sound/core/sound_oss.c | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | |||
| 24 | #ifdef CONFIG_SND_OSSEMUL | 22 | #ifdef CONFIG_SND_OSSEMUL |
| 25 | 23 | ||
| 26 | #if !defined(CONFIG_SOUND) && !(defined(MODULE) && defined(CONFIG_SOUND_MODULE)) | 24 | #if !defined(CONFIG_SOUND) && !(defined(MODULE) && defined(CONFIG_SOUND_MODULE)) |
diff --git a/sound/core/timer.c b/sound/core/timer.c index 7e5fe2d91662..aece465934b8 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index e008f3c58eac..a240eaeb5c62 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c index 443104d23159..05a871aa7b81 100644 --- a/sound/drivers/ml403-ac97cr.c +++ b/sound/drivers/ml403-ac97cr.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * But there might still be some ... | 33 | * But there might still be some ... |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <sound/driver.h> | ||
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/moduleparam.h> | 37 | #include <linux/moduleparam.h> |
| 39 | 38 | ||
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c index 1fc95dadde1d..5b996f3faba5 100644 --- a/sound/drivers/mpu401/mpu401.c +++ b/sound/drivers/mpu401/mpu401.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/pnp.h> | 24 | #include <linux/pnp.h> |
| 26 | #include <linux/err.h> | 25 | #include <linux/err.h> |
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c index b57f2d5a1c9d..5993864acbd3 100644 --- a/sound/drivers/mpu401/mpu401_uart.c +++ b/sound/drivers/mpu401/mpu401_uart.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <sound/driver.h> | ||
| 32 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 33 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index 40eb026c86ed..b5e1a71bb64b 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | * | 50 | * |
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <sound/driver.h> | ||
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| 55 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
| 56 | #include <linux/err.h> | 55 | #include <linux/err.h> |
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index e12ba3d52731..f057d92fe86d 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 24 | #include <linux/parport.h> | 23 | #include <linux/parport.h> |
diff --git a/sound/drivers/pcm-indirect2.c b/sound/drivers/pcm-indirect2.c index 660157d49422..3c93c23e4883 100644 --- a/sound/drivers/pcm-indirect2.c +++ b/sound/drivers/pcm-indirect2.c | |||
| @@ -25,8 +25,6 @@ | |||
| 25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | /* #dependency of sound/core.h# */ | ||
| 29 | #include <sound/driver.h> | ||
| 30 | /* snd_printk/d() */ | 28 | /* snd_printk/d() */ |
| 31 | #include <sound/core.h> | 29 | #include <sound/core.h> |
| 32 | /* struct snd_pcm_substream, struct snd_pcm_runtime, snd_pcm_uframes_t | 30 | /* struct snd_pcm_substream, struct snd_pcm_runtime, snd_pcm_uframes_t |
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 7e7c668eacdd..b1c047ec19af 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * - ported from alsa 0.5 to 1.0 | 37 | * - ported from alsa 0.5 to 1.0 |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <sound/driver.h> | ||
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 42 | #include <linux/platform_device.h> | 41 | #include <linux/platform_device.h> |
| 43 | #include <linux/parport.h> | 42 | #include <linux/parport.h> |
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index f4156011945f..d8aab9da97c2 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * More documentation can be found in serial-u16550.txt. | 30 | * More documentation can be found in serial-u16550.txt. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <sound/driver.h> | ||
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 35 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 36 | #include <linux/err.h> | 35 | #include <linux/err.h> |
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index 915c86773c21..f79e3614079d 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | * - Run application using a midi device (eg. /dev/snd/midiC1D0) | 41 | * - Run application using a midi device (eg. /dev/snd/midiC1D0) |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <sound/driver.h> | ||
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 46 | #include <linux/wait.h> | 45 | #include <linux/wait.h> |
| 47 | #include <linux/err.h> | 46 | #include <linux/err.h> |
diff --git a/sound/drivers/vx/vx_cmd.c b/sound/drivers/vx/vx_cmd.c index 7a221349f285..9529e3bf2866 100644 --- a/sound/drivers/vx/vx_cmd.c +++ b/sound/drivers/vx/vx_cmd.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
| 26 | #include <sound/vx_core.h> | 25 | #include <sound/vx_core.h> |
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c index ed19bc17400b..99538862e342 100644 --- a/sound/drivers/vx/vx_core.c +++ b/sound/drivers/vx/vx_core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c index 9a8154c9416e..1dfe6948e6ff 100644 --- a/sound/drivers/vx/vx_hwdep.c +++ b/sound/drivers/vx/vx_hwdep.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 25 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
| 26 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c index a37f0a8f17af..5a347321f8c0 100644 --- a/sound/drivers/vx/vx_mixer.c +++ b/sound/drivers/vx/vx_mixer.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/control.h> | 24 | #include <sound/control.h> |
| 26 | #include <sound/tlv.h> | 25 | #include <sound/tlv.h> |
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index 7e65a103fbb2..fdbf86571b1f 100644 --- a/sound/drivers/vx/vx_pcm.c +++ b/sound/drivers/vx/vx_pcm.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | * - scheduled action on the stream. | 45 | * - scheduled action on the stream. |
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | #include <sound/driver.h> | ||
| 49 | #include <linux/slab.h> | 48 | #include <linux/slab.h> |
| 50 | #include <linux/vmalloc.h> | 49 | #include <linux/vmalloc.h> |
| 51 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c index 7400306b7f28..fb8932af888d 100644 --- a/sound/drivers/vx/vx_uer.c +++ b/sound/drivers/vx/vx_uer.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 26 | #include <sound/vx_core.h> | 25 | #include <sound/vx_core.h> |
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c index 744366b72345..e57e9cbe6a0f 100644 --- a/sound/i2c/cs8427.c +++ b/sound/i2c/cs8427.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c index 1e58a963b2a7..b1e74e40cba0 100644 --- a/sound/i2c/i2c.c +++ b/sound/i2c/i2c.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include <linux/string.h> | 25 | #include <linux/string.h> |
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c index b074fdddea55..bfa5d2c3608b 100644 --- a/sound/i2c/l3/uda1341.c +++ b/sound/i2c/l3/uda1341.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | /* $Id: uda1341.c,v 1.18 2005/11/17 14:17:21 tiwai Exp $ */ | 20 | /* $Id: uda1341.c,v 1.18 2005/11/17 14:17:21 tiwai Exp $ */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index facde46f957a..15061bd72776 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index ee1585aec99b..f350835ade96 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index fefa1ae57ad9..35fbbf2cb9fa 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/i2c/other/pt2258.c b/sound/i2c/other/pt2258.c index 987d2c9a7a64..797d3a6687eb 100644 --- a/sound/i2c/other/pt2258.c +++ b/sound/i2c/other/pt2258.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/control.h> | 23 | #include <sound/control.h> |
| 25 | #include <sound/tlv.h> | 24 | #include <sound/tlv.h> |
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c index 37c47fb95aca..28a4af782f5e 100644 --- a/sound/i2c/other/tea575x-tuner.c +++ b/sound/i2c/other/tea575x-tuner.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index 9bab744af0ef..0e3a9f2c5297 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c index 994bc85376c1..68f1260b5602 100644 --- a/sound/isa/ad1816a/ad1816a.c +++ b/sound/isa/ad1816a/ad1816a.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index cf18fe4617a1..4b8dfe2e3dcb 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index a4710b5e214c..5f5271efdc59 100644 --- a/sound/isa/ad1848/ad1848.c +++ b/sound/isa/ad1848/ad1848.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 27 | #include <linux/isa.h> | 26 | #include <linux/isa.h> |
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c index 9a640353350a..630c90f9ee50 100644 --- a/sound/isa/ad1848/ad1848_lib.c +++ b/sound/isa/ad1848/ad1848_lib.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #define SNDRV_MAIN_OBJECT_FILE | 22 | #define SNDRV_MAIN_OBJECT_FILE |
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c index d68720724c91..efa8c80d05b6 100644 --- a/sound/isa/adlib.c +++ b/sound/isa/adlib.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * AdLib FM card driver. | 2 | * AdLib FM card driver. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <sound/driver.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/isa.h> | 7 | #include <linux/isa.h> |
diff --git a/sound/isa/als100.c b/sound/isa/als100.c index 35e25e5878e0..f1ce30f379c9 100644 --- a/sound/isa/als100.c +++ b/sound/isa/als100.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/wait.h> | 24 | #include <linux/wait.h> |
| 26 | #include <linux/time.h> | 25 | #include <linux/time.h> |
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c index bfe3a255815c..154e728f592d 100644 --- a/sound/isa/azt2320.c +++ b/sound/isa/azt2320.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | activation method (full-duplex audio!). | 29 | activation method (full-duplex audio!). |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <sound/driver.h> | ||
| 33 | #include <asm/io.h> | 32 | #include <asm/io.h> |
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index c166e13d17ec..4d198ec71e9b 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * full control over both mixers. | 43 | * full control over both mixers. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <sound/driver.h> | ||
| 47 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 48 | #include <linux/err.h> | 47 | #include <linux/err.h> |
| 49 | #include <linux/isa.h> | 48 | #include <linux/isa.h> |
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c index 13db6842eaaa..e9462b9944be 100644 --- a/sound/isa/cs423x/cs4231.c +++ b/sound/isa/cs423x/cs4231.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 26 | #include <linux/isa.h> | 25 | #include <linux/isa.h> |
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c index a5eb9659b519..1cd3fe33a47e 100644 --- a/sound/isa/cs423x/cs4231_lib.c +++ b/sound/isa/cs423x/cs4231_lib.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/pm.h> | 28 | #include <linux/pm.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 0a3fece40f8b..dbe63db4bfd6 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 6bd064470d4c..de71910401ea 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c | |||
| @@ -79,7 +79,6 @@ | |||
| 79 | * | 79 | * |
| 80 | */ | 80 | */ |
| 81 | 81 | ||
| 82 | #include <sound/driver.h> | ||
| 83 | #include <asm/io.h> | 82 | #include <asm/io.h> |
| 84 | #include <linux/delay.h> | 83 | #include <linux/delay.h> |
| 85 | #include <linux/init.h> | 84 | #include <linux/init.h> |
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c index ab689f948aea..a0242c3b613e 100644 --- a/sound/isa/dt019x.c +++ b/sound/isa/dt019x.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
| 27 | #include <linux/pnp.h> | 26 | #include <linux/pnp.h> |
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index 74bbc92f2e7c..f88639ea64b2 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index 5c26d495daa8..1e1e575b1db3 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 91cb478103de..90498e4ca260 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
| @@ -77,7 +77,6 @@ | |||
| 77 | * needed for ZV, so maybe the datasheet is entirely wrong here. | 77 | * needed for ZV, so maybe the datasheet is entirely wrong here. |
| 78 | */ | 78 | */ |
| 79 | 79 | ||
| 80 | #include <sound/driver.h> | ||
| 81 | #include <linux/init.h> | 80 | #include <linux/init.h> |
| 82 | #include <linux/err.h> | 81 | #include <linux/err.h> |
| 83 | #include <linux/isa.h> | 82 | #include <linux/isa.h> |
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c index fc905141e8a5..f45f6116c77a 100644 --- a/sound/isa/gus/gus_dma.c +++ b/sound/isa/gus/gus_dma.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/dma.h> | 22 | #include <asm/dma.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/isa/gus/gus_dram.c b/sound/isa/gus/gus_dram.c index 9eaa932f6efe..fd2e2e2ed4e7 100644 --- a/sound/isa/gus/gus_dram.c +++ b/sound/isa/gus/gus_dram.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/gus.h> | 24 | #include <sound/gus.h> |
diff --git a/sound/isa/gus/gus_instr.c b/sound/isa/gus/gus_instr.c index bf137ea72329..4dc9caf8ddcf 100644 --- a/sound/isa/gus/gus_instr.c +++ b/sound/isa/gus/gus_instr.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/gus.h> | 24 | #include <sound/gus.h> |
diff --git a/sound/isa/gus/gus_io.c b/sound/isa/gus/gus_io.c index 3d4f899285ef..ca79878d8d8c 100644 --- a/sound/isa/gus/gus_io.c +++ b/sound/isa/gus/gus_io.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c index cd9a6f1c99e6..041894ddd014 100644 --- a/sound/isa/gus/gus_irq.c +++ b/sound/isa/gus/gus_irq.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/info.h> | 23 | #include <sound/info.h> |
| 25 | #include <sound/gus.h> | 24 | #include <sound/gus.h> |
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index e4453e5e5c23..cccc16c8113f 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index bcf4656853c4..661205c4dcea 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c index f69a44728ebf..2803e227aec9 100644 --- a/sound/isa/gus/gus_mem_proc.c +++ b/sound/isa/gus/gus_mem_proc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/gus.h> | 24 | #include <sound/gus.h> |
diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c index a96253e16654..ebdb33469306 100644 --- a/sound/isa/gus/gus_mixer.c +++ b/sound/isa/gus/gus_mixer.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index a7971f5ffe63..99731dc97325 100644 --- a/sound/isa/gus/gus_pcm.c +++ b/sound/isa/gus/gus_pcm.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <asm/dma.h> | 28 | #include <asm/dma.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 31 | #include <sound/core.h> | 30 | #include <sound/core.h> |
diff --git a/sound/isa/gus/gus_reset.c b/sound/isa/gus/gus_reset.c index 20cfdb87f84a..3d1fed0c2620 100644 --- a/sound/isa/gus/gus_reset.c +++ b/sound/isa/gus/gus_reset.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
diff --git a/sound/isa/gus/gus_timer.c b/sound/isa/gus/gus_timer.c index 99eac573c414..c53727147a1a 100644 --- a/sound/isa/gus/gus_timer.c +++ b/sound/isa/gus/gus_timer.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/gus.h> | 26 | #include <sound/gus.h> |
diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c index e6fd9b01c492..f0af3f79b08b 100644 --- a/sound/isa/gus/gus_uart.c +++ b/sound/isa/gus/gus_uart.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
diff --git a/sound/isa/gus/gus_volume.c b/sound/isa/gus/gus_volume.c index 71a67744a14b..c3c028a4a46b 100644 --- a/sound/isa/gus/gus_volume.c +++ b/sound/isa/gus/gus_volume.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/time.h> | 21 | #include <linux/time.h> |
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/gus.h> | 23 | #include <sound/gus.h> |
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c index 29e422b00b58..8f914b37bf89 100644 --- a/sound/isa/gus/gusclassic.c +++ b/sound/isa/gus/gusclassic.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c index fc59536c918e..da13185eb0a0 100644 --- a/sound/isa/gus/gusextreme.c +++ b/sound/isa/gus/gusextreme.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index 4922f5da08f9..f87c6236661c 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 9381d1e8ad75..ca0d7ace0c75 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/err.h> | 26 | #include <linux/err.h> |
| 28 | #include <linux/isa.h> | 27 | #include <linux/isa.h> |
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 125f6994bfb1..854a9f74b466 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index c2baf4cfb958..b18d14f29db4 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/err.h> | 26 | #include <linux/err.h> |
| 28 | #include <linux/isa.h> | 27 | #include <linux/isa.h> |
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 9300cf371ee8..1f9c55768439 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 29 | #include <linux/isa.h> | 28 | #include <linux/isa.h> |
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 4eea84cfd4f4..b35be7d9a9fa 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
diff --git a/sound/isa/sb/emu8000_local.h b/sound/isa/sb/emu8000_local.h index 2ac77f10bb4e..7e87c349272f 100644 --- a/sound/isa/sb/emu8000_local.h +++ b/sound/isa/sb/emu8000_local.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/wait.h> | 24 | #include <linux/wait.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index 3049692bcc57..c8c8e214c843 100644 --- a/sound/isa/sb/es968.c +++ b/sound/isa/sb/es968.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <linux/pnp.h> | 25 | #include <linux/pnp.h> |
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c index 8e1aff77b900..2c201f78ce50 100644 --- a/sound/isa/sb/sb16.c +++ b/sound/isa/sb/sb16.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/dma.h> | 22 | #include <asm/dma.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c index 5f21aec585f6..bed29ca22239 100644 --- a/sound/isa/sb/sb16_csp.c +++ b/sound/isa/sb/sb16_csp.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index c06754f7ee5d..f7e8192270ae 100644 --- a/sound/isa/sb/sb16_main.c +++ b/sound/isa/sb/sb16_main.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <sound/driver.h> | ||
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
| 38 | #include <asm/dma.h> | 37 | #include <asm/dma.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index f933aef7d8a9..336a34277907 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/isa.h> | 24 | #include <linux/isa.h> |
diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c index bee894b3f5c7..6304c3a89ba0 100644 --- a/sound/isa/sb/sb8_main.c +++ b/sound/isa/sb/sb8_main.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Cleaned up and rewrote lowlevel routines. | 30 | * Cleaned up and rewrote lowlevel routines. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <sound/driver.h> | ||
| 34 | #include <asm/io.h> | 33 | #include <asm/io.h> |
| 35 | #include <asm/dma.h> | 34 | #include <asm/dma.h> |
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c index e56e5633411c..988a8b73475f 100644 --- a/sound/isa/sb/sb8_midi.c +++ b/sound/isa/sb/sb8_midi.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Added full duplex UART mode for DSP version 2.0 and later. | 26 | * Added full duplex UART mode for DSP version 2.0 and later. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <asm/io.h> | 29 | #include <asm/io.h> |
| 31 | #include <linux/time.h> | 30 | #include <linux/time.h> |
| 32 | #include <sound/core.h> | 31 | #include <sound/core.h> |
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index 176193c05101..d63c1af550de 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c index 03241cd5aaef..91d14224f6b3 100644 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index bc0c37956f2e..da3d152bcad4 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/isa.h> | 28 | #include <linux/isa.h> |
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c index 922519def099..a07274ecb149 100644 --- a/sound/isa/sgalaxy.c +++ b/sound/isa/sgalaxy.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 27 | #include <linux/isa.h> | 26 | #include <linux/isa.h> |
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 1cb921d6137e..06ad7863dff5 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 27 | #include <linux/isa.h> | 26 | #include <linux/isa.h> |
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c index 15c604653428..3a6c6fe1ec4d 100644 --- a/sound/isa/wavefront/wavefront.c +++ b/sound/isa/wavefront/wavefront.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c index fc95a870f690..2efaa7f205aa 100644 --- a/sound/isa/wavefront/wavefront_fx.c +++ b/sound/isa/wavefront/wavefront_fx.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <sound/driver.h> | ||
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/time.h> | 21 | #include <linux/time.h> |
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c index cb3460094324..a33384a55b0f 100644 --- a/sound/isa/wavefront/wavefront_midi.c +++ b/sound/isa/wavefront/wavefront_midi.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | * | 47 | * |
| 48 | */ | 48 | */ |
| 49 | 49 | ||
| 50 | #include <sound/driver.h> | ||
| 51 | #include <asm/io.h> | 50 | #include <asm/io.h> |
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/time.h> | 52 | #include <linux/time.h> |
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index a1ebb7c5c684..95eeca163354 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/sound/last.c b/sound/last.c index 282b0cdb0589..bdd0857b8871 100644 --- a/sound/last.c +++ b/sound/last.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #define SNDRV_MAIN_OBJECT_FILE | 22 | #define SNDRV_MAIN_OBJECT_FILE |
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 26 | 25 | ||
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 24460a558bf7..ee0741f9eb53 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
| 38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <sound/driver.h> | ||
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
| 42 | #include <linux/version.h> | 41 | #include <linux/version.h> |
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index ff705c63a03a..99f5483abf2e 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/spinlock.h> | 45 | #include <linux/spinlock.h> |
| 46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
| 47 | 47 | ||
| 48 | #include <sound/driver.h> | ||
| 49 | #include <sound/core.h> | 48 | #include <sound/core.h> |
| 50 | #include <sound/pcm.h> | 49 | #include <sound/pcm.h> |
| 51 | #include <sound/control.h> | 50 | #include <sound/control.h> |
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 6a9966df0cc9..45fd29017ddd 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c index 8cbc03332b01..3674f35c4a79 100644 --- a/sound/pci/ac97/ac97_pcm.c +++ b/sound/pci/ac97/ac97_pcm.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c index fed4a2c3d8a1..060ea59d5f02 100644 --- a/sound/pci/ac97/ac97_proc.c +++ b/sound/pci/ac97/ac97_proc.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 27 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 28 | 27 | ||
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c index 722de451d15f..c0c1633999ea 100644 --- a/sound/pci/ac97/ak4531_codec.c +++ b/sound/pci/ac97/ak4531_codec.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 98970d401be9..be9f1a276be8 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/compiler.h> | 40 | #include <linux/compiler.h> |
| 41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 42 | 42 | ||
| 43 | #include <sound/driver.h> | ||
| 44 | #include <sound/core.h> | 43 | #include <sound/core.h> |
| 45 | #include <sound/pcm.h> | 44 | #include <sound/pcm.h> |
| 46 | #include <sound/initval.h> | 45 | #include <sound/initval.h> |
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 4c2bd7adf674..6a905ed9cbd6 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 48cc39b771d9..0e990a735821 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * to keep track of what period we are in. | 30 | * to keep track of what period we are in. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <sound/driver.h> | ||
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index 1190ef366a41..27ce6136ab00 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | * - power management? (card can do voice wakeup according to datasheet!!) | 63 | * - power management? (card can do voice wakeup according to datasheet!!) |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | #include <sound/driver.h> | ||
| 67 | #include <asm/io.h> | 66 | #include <asm/io.h> |
| 68 | #include <linux/init.h> | 67 | #include <linux/init.h> |
| 69 | #include <linux/pci.h> | 68 | #include <linux/pci.h> |
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 89184a424140..e9c87f5966b3 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index ce752f84457a..a67a869180d4 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index 5ccf0b1ec670..4aad35bba11a 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #define __SOUND_AU88X0_H | 18 | #define __SOUND_AU88X0_H |
| 19 | 19 | ||
| 20 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
diff --git a/sound/pci/au88x0/au88x0_game.c b/sound/pci/au88x0/au88x0_game.c index a07d1deba322..bc212f41a38a 100644 --- a/sound/pci/au88x0/au88x0_game.c +++ b/sound/pci/au88x0/au88x0_game.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * driver. (email: mjander@embedded.cl). | 30 | * driver. (email: mjander@embedded.cl). |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <sound/driver.h> | ||
| 34 | #include <linux/time.h> | 33 | #include <linux/time.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
diff --git a/sound/pci/au88x0/au88x0_mixer.c b/sound/pci/au88x0/au88x0_mixer.c index c96da1dab863..c92f493d341e 100644 --- a/sound/pci/au88x0/au88x0_mixer.c +++ b/sound/pci/au88x0/au88x0_mixer.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <sound/driver.h> | ||
| 9 | #include <linux/time.h> | 8 | #include <linux/time.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <sound/core.h> | 10 | #include <sound/core.h> |
diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c index 8db3d3e6f7bb..0dc8d259d1ed 100644 --- a/sound/pci/au88x0/au88x0_mpu401.c +++ b/sound/pci/au88x0/au88x0_mpu401.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index 7b5baa173859..526c6c5ecf7b 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * It remains stuck,and DMA transfers do not happen. | 21 | * It remains stuck,and DMA transfers do not happen. |
| 22 | */ | 22 | */ |
| 23 | #include <sound/asoundef.h> | 23 | #include <sound/asoundef.h> |
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 36d3666a5b77..4e71a55120a0 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
| @@ -115,7 +115,6 @@ | |||
| 115 | * code (but I'm not too optimistic that doing this is possible at all) | 115 | * code (but I'm not too optimistic that doing this is possible at all) |
| 116 | */ | 116 | */ |
| 117 | 117 | ||
| 118 | #include <sound/driver.h> | ||
| 119 | #include <asm/io.h> | 118 | #include <asm/io.h> |
| 120 | #include <linux/init.h> | 119 | #include <linux/init.h> |
| 121 | #include <linux/pci.h> | 120 | #include <linux/pci.h> |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 2dba752faf4e..c9a2421cf6f0 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 27 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 31d8db9f7a4c..176e0f0e8058 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
| @@ -135,7 +135,6 @@ | |||
| 135 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 135 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 136 | * | 136 | * |
| 137 | */ | 137 | */ |
| 138 | #include <sound/driver.h> | ||
| 139 | #include <linux/delay.h> | 138 | #include <linux/delay.h> |
| 140 | #include <linux/init.h> | 139 | #include <linux/init.h> |
| 141 | #include <linux/interrupt.h> | 140 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index 3f9b5c560036..af736869d9b1 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 60 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 61 | * | 61 | * |
| 62 | */ | 62 | */ |
| 63 | #include <sound/driver.h> | ||
| 64 | #include <linux/delay.h> | 63 | #include <linux/delay.h> |
| 65 | #include <linux/init.h> | 64 | #include <linux/init.h> |
| 66 | #include <linux/interrupt.h> | 65 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c index 61f2718ae359..c62b7d10ec61 100644 --- a/sound/pci/ca0106/ca0106_proc.c +++ b/sound/pci/ca0106/ca0106_proc.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 60 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 61 | * | 61 | * |
| 62 | */ | 62 | */ |
| 63 | #include <sound/driver.h> | ||
| 64 | #include <linux/delay.h> | 63 | #include <linux/delay.h> |
| 65 | #include <linux/init.h> | 64 | #include <linux/init.h> |
| 66 | #include <linux/interrupt.h> | 65 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ca0106/ca_midi.c b/sound/pci/ca0106/ca_midi.c index ad32eff2713f..893ee4f1ea77 100644 --- a/sound/pci/ca0106/ca_midi.c +++ b/sound/pci/ca0106/ca_midi.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 30 | #include <sound/driver.h> | ||
| 31 | #include <sound/core.h> | 30 | #include <sound/core.h> |
| 32 | #include <sound/rawmidi.h> | 31 | #include <sound/rawmidi.h> |
| 33 | 32 | ||
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index bc0a1959f920..135f30860753 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | /* Does not work. Warning may block system in capture mode */ | 20 | /* Does not work. Warning may block system in capture mode */ |
| 21 | /* #define USE_VAR48KRATE */ | 21 | /* #define USE_VAR48KRATE */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 9a55f4a9739b..7556fd90d0eb 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c index 2699cb6c2cd6..e876b3263e46 100644 --- a/sound/pci/cs46xx/cs46xx.c +++ b/sound/pci/cs46xx/cs46xx.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | reloading the module may solve this. | 25 | reloading the module may solve this. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 30 | #include <linux/time.h> | 29 | #include <linux/time.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 28f98bd9f743..87ddffcd9d89 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | * | 45 | * |
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | #include <sound/driver.h> | ||
| 49 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 50 | #include <linux/pci.h> | 49 | #include <linux/pci.h> |
| 51 | #include <linux/pm.h> | 50 | #include <linux/pm.h> |
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c index 590b35d91df2..ccc8bedb5b1a 100644 --- a/sound/pci/cs46xx/dsp_spos.c +++ b/sound/pci/cs46xx/dsp_spos.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/pm.h> | 25 | #include <linux/pm.h> |
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c index eded4dfeba12..2873cfe48c33 100644 --- a/sound/pci/cs46xx/dsp_spos_scb_lib.c +++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/pm.h> | 26 | #include <linux/pm.h> |
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 240a0a462209..7ff8b68e997e 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * same manner. | 36 | * same manner. |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <sound/driver.h> | ||
| 40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
| 41 | #include <linux/moduleparam.h> | 40 | #include <linux/moduleparam.h> |
| 42 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index 2b35889787be..a0c54f0a265f 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c index 21df0634af32..499e27961a30 100644 --- a/sound/pci/cs5535audio/cs5535audio_pcm.c +++ b/sound/pci/cs5535audio/cs5535audio_pcm.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <sound/driver.h> | ||
| 29 | #include <sound/core.h> | 28 | #include <sound/core.h> |
| 30 | #include <sound/control.h> | 29 | #include <sound/control.h> |
| 31 | #include <sound/initval.h> | 30 | #include <sound/initval.h> |
diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c index 838708f6d45e..564c33b60953 100644 --- a/sound/pci/cs5535audio/cs5535audio_pm.c +++ b/sound/pci/cs5535audio/cs5535audio_pm.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/control.h> | 26 | #include <sound/control.h> |
| 28 | #include <sound/initval.h> | 27 | #include <sound/initval.h> |
diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c index 87078d3a6854..8c6db3aa3c1a 100644 --- a/sound/pci/echoaudio/darla20.c +++ b/sound/pci/echoaudio/darla20.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #define BX_NUM 10 | 36 | #define BX_NUM 10 |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | #include <sound/driver.h> | ||
| 40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 42 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c index 42b48f9d2128..04cbf3eaf05a 100644 --- a/sound/pci/echoaudio/darla24.c +++ b/sound/pci/echoaudio/darla24.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #define BX_NUM 10 | 40 | #define BX_NUM 10 |
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | #include <sound/driver.h> | ||
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 46 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c index 8dbb7ac865c1..4022e43a0053 100644 --- a/sound/pci/echoaudio/echo3g.c +++ b/sound/pci/echoaudio/echo3g.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #define BX_NUM chip->bx_num | 47 | #define BX_NUM chip->bx_num |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | #include <sound/driver.h> | ||
| 51 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c index fee2d4831732..c0e64b8f52a4 100644 --- a/sound/pci/echoaudio/gina20.c +++ b/sound/pci/echoaudio/gina20.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #define BX_NUM 14 | 40 | #define BX_NUM 14 |
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | #include <sound/driver.h> | ||
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 46 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c index d5eae470fe9a..c36a78dd0b5e 100644 --- a/sound/pci/echoaudio/gina24.c +++ b/sound/pci/echoaudio/gina24.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #define BX_NUM 26 | 46 | #define BX_NUM 26 |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | #include <sound/driver.h> | ||
| 50 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 52 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/indigo.c b/sound/pci/echoaudio/indigo.c index 40f601cd016f..0a58a7c1fd7c 100644 --- a/sound/pci/echoaudio/indigo.c +++ b/sound/pci/echoaudio/indigo.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #define BX_NUM 2 | 38 | #define BX_NUM 2 |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | #include <sound/driver.h> | ||
| 42 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 44 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c index 771c5383210d..2db24d29332b 100644 --- a/sound/pci/echoaudio/indigodj.c +++ b/sound/pci/echoaudio/indigodj.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #define BX_NUM 4 | 38 | #define BX_NUM 4 |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | #include <sound/driver.h> | ||
| 42 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 44 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c index 49c550defcf9..a60c0a0a89b7 100644 --- a/sound/pci/echoaudio/indigoio.c +++ b/sound/pci/echoaudio/indigoio.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #define BX_NUM 4 | 39 | #define BX_NUM 4 |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | #include <sound/driver.h> | ||
| 43 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
| 44 | #include <linux/init.h> | 43 | #include <linux/init.h> |
| 45 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c index 8f5483a405ae..506194688995 100644 --- a/sound/pci/echoaudio/layla20.c +++ b/sound/pci/echoaudio/layla20.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #define BX_NUM 22 | 45 | #define BX_NUM 22 |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | #include <sound/driver.h> | ||
| 49 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 51 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/layla24.c b/sound/pci/echoaudio/layla24.c index 0524667c02f7..e09e3ea7781e 100644 --- a/sound/pci/echoaudio/layla24.c +++ b/sound/pci/echoaudio/layla24.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #define BX_NUM 32 | 47 | #define BX_NUM 32 |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | #include <sound/driver.h> | ||
| 51 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c index 893c7c20dd70..f3b9b45c9c1b 100644 --- a/sound/pci/echoaudio/mia.c +++ b/sound/pci/echoaudio/mia.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #define BX_NUM 8 | 45 | #define BX_NUM 8 |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | #include <sound/driver.h> | ||
| 49 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 51 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |
diff --git a/sound/pci/echoaudio/mona.c b/sound/pci/echoaudio/mona.c index 3a5d5b0020df..b05bad944901 100644 --- a/sound/pci/echoaudio/mona.c +++ b/sound/pci/echoaudio/mona.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #define BX_NUM 26 | 44 | #define BX_NUM 26 |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | #include <sound/driver.h> | ||
| 48 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
| 49 | #include <linux/init.h> | 48 | #include <linux/init.h> |
| 50 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 9680caff90c8..8354c1a83312 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 29 | #include <linux/time.h> | 28 | #include <linux/time.h> |
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 97c41d72a255..69f342ce9b2a 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
| 35 | #include <linux/kthread.h> | 35 | #include <linux/kthread.h> |
| 36 | #include <sound/driver.h> | ||
| 37 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
diff --git a/sound/pci/emu10k1/emu10k1_synth_local.h b/sound/pci/emu10k1/emu10k1_synth_local.h index 308ddc84bb4d..25f328ff639f 100644 --- a/sound/pci/emu10k1/emu10k1_synth_local.h +++ b/sound/pci/emu10k1/emu10k1_synth_local.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 26 | #include <sound/emu10k1_synth.h> | 25 | #include <sound/emu10k1_synth.h> |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 0030d8b84669..5512abd98bd9 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 29 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 30 | * | 30 | * |
| 31 | */ | 31 | */ |
| 32 | #include <sound/driver.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 35 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 9bf1cd592199..c35d9e1cb6dd 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <sound/driver.h> | ||
| 32 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 33 | #include <linux/capability.h> | 32 | #include <linux/capability.h> |
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index ccacd7b890e8..5a38fe71e52f 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <sound/driver.h> | ||
| 34 | #include <linux/time.h> | 33 | #include <linux/time.h> |
| 35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 36 | #include <sound/core.h> | 35 | #include <sound/core.h> |
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c index 04c7cf703531..c4d76d16661e 100644 --- a/sound/pci/emu10k1/emumpu401.c +++ b/sound/pci/emu10k1/emumpu401.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 5ce5befc701b..cf4e3ec6530e 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index c3fb10e81c9e..bd8a47116528 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <sound/driver.h> | ||
| 32 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <sound/core.h> | 33 | #include <sound/core.h> |
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index 6702c15fefa3..2862e17446fe 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <linux/time.h> | 28 | #include <linux/time.h> |
| 30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
| 31 | #include <sound/emu10k1.h> | 30 | #include <sound/emu10k1.h> |
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c index 3c114b45e0b2..276d08c88f91 100644 --- a/sound/pci/emu10k1/irq.c +++ b/sound/pci/emu10k1/irq.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <linux/time.h> | 28 | #include <linux/time.h> |
| 30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
| 31 | #include <sound/emu10k1.h> | 30 | #include <sound/emu10k1.h> |
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 48097c6bb15c..916c1dbcd53c 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 26 | #include <linux/time.h> | 25 | #include <linux/time.h> |
| 27 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index 9fd3135f3118..749a21b6bd06 100644 --- a/sound/pci/emu10k1/p16v.c +++ b/sound/pci/emu10k1/p16v.c | |||
| @@ -87,7 +87,6 @@ | |||
| 87 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 87 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 88 | * | 88 | * |
| 89 | */ | 89 | */ |
| 90 | #include <sound/driver.h> | ||
| 91 | #include <linux/delay.h> | 90 | #include <linux/delay.h> |
| 92 | #include <linux/init.h> | 91 | #include <linux/init.h> |
| 93 | #include <linux/interrupt.h> | 92 | #include <linux/interrupt.h> |
diff --git a/sound/pci/emu10k1/timer.c b/sound/pci/emu10k1/timer.c index 6295b2dca785..72321e946ccc 100644 --- a/sound/pci/emu10k1/timer.c +++ b/sound/pci/emu10k1/timer.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <linux/time.h> | 28 | #include <linux/time.h> |
| 30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
| 31 | #include <sound/emu10k1.h> | 30 | #include <sound/emu10k1.h> |
diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c index 04fa8492abb0..958cb2a65a4e 100644 --- a/sound/pci/emu10k1/voice.c +++ b/sound/pci/emu10k1/voice.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <sound/driver.h> | ||
| 32 | #include <linux/time.h> | 31 | #include <linux/time.h> |
| 33 | #include <sound/core.h> | 32 | #include <sound/core.h> |
| 34 | #include <sound/emu10k1.h> | 33 | #include <sound/emu10k1.h> |
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index b958f869cb13..72d85a5ae6a0 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * by Kurt J. Bosch | 26 | * by Kurt J. Bosch |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <asm/io.h> | 29 | #include <asm/io.h> |
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index fb25abe68a02..fbe3da73eaff 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | #include <sound/driver.h> | ||
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 52 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
| 53 | #include <linux/pci.h> | 52 | #include <linux/pci.h> |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index d69b11d1f993..25ccfce45759 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
| @@ -94,7 +94,6 @@ | |||
| 94 | * places. | 94 | * places. |
| 95 | */ | 95 | */ |
| 96 | 96 | ||
| 97 | #include <sound/driver.h> | ||
| 98 | #include <asm/io.h> | 97 | #include <asm/io.h> |
| 99 | #include <linux/delay.h> | 98 | #include <linux/delay.h> |
| 100 | #include <linux/interrupt.h> | 99 | #include <linux/interrupt.h> |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 9939109f05a2..25c1087d2c00 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index cd807194e5f1..a2b40dc372c9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index c957eb58de5c..f9de7c467c25 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index bafb7b01f5a1..2177d9af5334 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a37e8946c7b0..3ae4b4c0ba23 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * | 34 | * |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <sound/driver.h> | ||
| 38 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 39 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 40 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 7df1d16d1469..4b8d64498fb1 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include "hda_codec.h" | 26 | #include "hda_codec.h" |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 67144dce90d7..6664a0688ef5 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c index 78441e3592b0..9a8bb4ce3f8d 100644 --- a/sound/pci/hda/patch_atihdmi.c +++ b/sound/pci/hda/patch_atihdmi.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index 6c54793bf424..02e31e4d95c4 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index e960189a3d1b..8b8de96df138 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1b2ad52bc908..5e36462ac0f9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index 2a4b9609aa5c..f5e43e867edb 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 299e02a26e58..61114cd958a4 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index d42d8f753f11..423b4999ee4a 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | 33 | /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | #include <sound/driver.h> | ||
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 39 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c index a1aba0d7d0e4..dab31b2756a6 100644 --- a/sound/pci/ice1712/ak4xxx.c +++ b/sound/pci/ice1712/ak4xxx.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c index 6e13d758bb5d..37564300b50d 100644 --- a/sound/pci/ice1712/amp.c +++ b/sound/pci/ice1712/amp.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index f83ec2f565cf..337489187614 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | * | 47 | * |
| 48 | */ | 48 | */ |
| 49 | 49 | ||
| 50 | #include <sound/driver.h> | ||
| 51 | #include <asm/io.h> | 50 | #include <asm/io.h> |
| 52 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 53 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index 519b5d4bbf7b..efd180b40e56 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c index 75e4e5e0f1e4..6f65da48e00d 100644 --- a/sound/pci/ice1712/ews.c +++ b/sound/pci/ice1712/ews.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c index abcfd1da6587..b2cfba16ebdf 100644 --- a/sound/pci/ice1712/hoontech.c +++ b/sound/pci/ice1712/hoontech.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 052fc3cb3272..47d77376bcd5 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | #include <sound/driver.h> | ||
| 51 | #include <asm/io.h> | 50 | #include <asm/io.h> |
| 52 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 53 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index b7a1d93cf002..3147cbc9edb3 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index 1fbe3ef8e60a..1a435df423c6 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c index c81efc2f8c95..718e9359e1f2 100644 --- a/sound/pci/ice1712/phase.c +++ b/sound/pci/ice1712/phase.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * CDTI may be completely blocked by 74HCT125's gate #1 controlled by GPIO 3 | 33 | * CDTI may be completely blocked by 74HCT125's gate #1 controlled by GPIO 3 |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <sound/driver.h> | ||
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 39 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index faefd52c1b80..4945c81e8a96 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index 6d81a1c61d41..733937807da3 100644 --- a/sound/pci/ice1712/prodigy192.c +++ b/sound/pci/ice1712/prodigy192.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * | 54 | * |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <sound/driver.h> | ||
| 58 | #include <asm/io.h> | 57 | #include <asm/io.h> |
| 59 | #include <linux/delay.h> | 58 | #include <linux/delay.h> |
| 60 | #include <linux/interrupt.h> | 59 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index d18a31e188a9..05a751c59893 100644 --- a/sound/pci/ice1712/revo.c +++ b/sound/pci/ice1712/revo.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/se.c b/sound/pci/ice1712/se.c index 3c8b518118e9..6661f65a6f2e 100644 --- a/sound/pci/ice1712/se.c +++ b/sound/pci/ice1712/se.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c index 239524158fe7..7f9674b641c0 100644 --- a/sound/pci/ice1712/vt1720_mobo.c +++ b/sound/pci/ice1712/vt1720_mobo.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c index 41a153d30c51..a08d17c7e651 100644 --- a/sound/pci/ice1712/wtm.c +++ b/sound/pci/ice1712/wtm.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 312373c81e7d..061072c7db03 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <asm/io.h> | 29 | #include <asm/io.h> |
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index fad806e60f36..cadda8d6b70f 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 6586abfaa148..10c713d9ac49 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 93dfedcaed86..04fa0a68416c 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #define CARD_NAME "ESS Maestro3/Allegro/Canyon3D-2" | 31 | #define CARD_NAME "ESS Maestro3/Allegro/Canyon3D-2" |
| 32 | #define DRIVER_NAME "Maestro3" | 32 | #define DRIVER_NAME "Maestro3" |
| 33 | 33 | ||
| 34 | #include <sound/driver.h> | ||
| 35 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 36 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 37 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 880b824e24cd..3dd0c7963273 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 27 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c index d54457317b14..785085e48353 100644 --- a/sound/pci/mixart/mixart_core.c +++ b/sound/pci/mixart/mixart_core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/mutex.h> | 24 | #include <linux/mutex.h> |
| 26 | 25 | ||
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c index 170781a72292..122c28efc483 100644 --- a/sound/pci/mixart/mixart_hwdep.c +++ b/sound/pci/mixart/mixart_hwdep.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 26 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
diff --git a/sound/pci/mixart/mixart_mixer.c b/sound/pci/mixart/mixart_mixer.c index 5b3c224732af..6fdda1f70b25 100644 --- a/sound/pci/mixart/mixart_mixer.c +++ b/sound/pci/mixart/mixart_mixer.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 276c5763f0e5..7ac654e381da 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index bfef5aba0b9d..ba7a2a83f339 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * GPIO 1 -> DFS1 of AK5385 | 28 | * GPIO 1 -> DFS1 of AK5385 |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <sound/driver.h> | ||
| 32 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 33 | #include <sound/core.h> | 32 | #include <sound/core.h> |
| 34 | #include <sound/initval.h> | 33 | #include <sound/initval.h> |
diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c index 5f4feeaf8b3a..616087c552e2 100644 --- a/sound/pci/oxygen/oxygen_io.c +++ b/sound/pci/oxygen/oxygen_io.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 6180cc858e60..2418ceb44858 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 23 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index e252abac004e..7208b0fb3ee5 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 22 | #include <sound/ac97_codec.h> | 21 | #include <sound/ac97_codec.h> |
| 23 | #include <sound/asoundef.h> | 22 | #include <sound/asoundef.h> |
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c index ff46ba5f2774..d4a1d73718e3 100644 --- a/sound/pci/oxygen/oxygen_pcm.c +++ b/sound/pci/oxygen/oxygen_pcm.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 22 | #include <sound/control.h> | 21 | #include <sound/control.h> |
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 5678dc36f9e5..6603a685ccca 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * GPIO 8 -> ? (amps enable?) | 30 | * GPIO 8 -> ? (amps enable?) |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <sound/driver.h> | ||
| 34 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <sound/control.h> | 35 | #include <sound/control.h> |
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 2d618bd7e62b..9d5bb76229a8 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index 0ff8dc36fde3..c4e415d07380 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index d55d8bc90eee..e6a4bfbb91bb 100644 --- a/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/sound/pci/pcxhr/pcxhr_hwdep.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/vmalloc.h> | 24 | #include <linux/vmalloc.h> |
| 26 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
diff --git a/sound/pci/pcxhr/pcxhr_mixer.c b/sound/pci/pcxhr/pcxhr_mixer.c index 4d8654575e18..aabc7bc5321e 100644 --- a/sound/pci/pcxhr/pcxhr_mixer.c +++ b/sound/pci/pcxhr/pcxhr_mixer.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 8e5410483e67..9408b1eeec40 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
| @@ -88,7 +88,6 @@ | |||
| 88 | Adopted for Windows NT driver 01/20/98 CNL | 88 | Adopted for Windows NT driver 01/20/98 CNL |
| 89 | */ | 89 | */ |
| 90 | 90 | ||
| 91 | #include <sound/driver.h> | ||
| 92 | #include <linux/delay.h> | 91 | #include <linux/delay.h> |
| 93 | #include <linux/init.h> | 92 | #include <linux/init.h> |
| 94 | #include <linux/interrupt.h> | 93 | #include <linux/interrupt.h> |
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index 1475912588e9..df184aabce84 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c | |||
| @@ -69,7 +69,6 @@ | |||
| 69 | */ | 69 | */ |
| 70 | 70 | ||
| 71 | 71 | ||
| 72 | #include <sound/driver.h> | ||
| 73 | #include <linux/delay.h> | 72 | #include <linux/delay.h> |
| 74 | #include <linux/init.h> | 73 | #include <linux/init.h> |
| 75 | #include <linux/interrupt.h> | 74 | #include <linux/interrupt.h> |
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index aff05bd15b77..fb0a4ee8bc02 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 67ec08cd9901..4ba9e019ad04 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 6b1d5292fc20..9a19ae6a64d9 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | #include <sound/driver.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 1d73be692b08..a123f0e6ba23 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 2f178598186d..dcd7cd010461 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 27 | #include <linux/time.h> | 26 | #include <linux/time.h> |
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 44a7f5fad573..0d3d305b0a0b 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index 6193c7e4d798..d94b16ffb385 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <sound/driver.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 27 | #include <linux/time.h> | 26 | #include <linux/time.h> |
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index c8d5665b5782..71138ff9b310 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * SiS7018 S/PDIF support by Thomas Winischhofer <thomas@winischhofer.net> | 27 | * SiS7018 S/PDIF support by Thomas Winischhofer <thomas@winischhofer.net> |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <sound/driver.h> | ||
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c index 847b8c6d5c0a..df9b487fa17e 100644 --- a/sound/pci/trident/trident_memory.c +++ b/sound/pci/trident/trident_memory.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 29 | #include <linux/time.h> | 28 | #include <linux/time.h> |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 18a58e43e78b..a756be661f9a 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * - Optimize position calculation for the 823x chips. | 46 | * - Optimize position calculation for the 823x chips. |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <sound/driver.h> | ||
| 50 | #include <asm/io.h> | 49 | #include <asm/io.h> |
| 51 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 52 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 57fb9ae22f93..f5df1c79bee1 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * modems. | 31 | * modems. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <sound/driver.h> | ||
| 35 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 36 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 37 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index 474eac9490ae..acc352f4a441 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index f4f0427a7420..b4bfc1acde88 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 26 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 5c4256a4d4b9..2631a554845e 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index c0789a50ad20..42c1eb7d35f5 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/firmware.h> | 22 | #include <linux/firmware.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 5f5bbea8c39a..819aaaac432f 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <sound/core.h> | 21 | #include <sound/core.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c index 484c8f9a6f1c..dfa40b0ed86d 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/info.h> | 23 | #include <sound/info.h> |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c index 54543369949e..fa4b11398b1f 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <sound/core.h> | 21 | #include <sound/core.h> |
| 23 | #include "pdaudiocf.h" | 22 | #include "pdaudiocf.h" |
| 24 | #include <sound/initval.h> | 23 | #include <sound/initval.h> |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c index 10afcb262d5c..01066c95580e 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/vmalloc.h> | 24 | #include <linux/vmalloc.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
diff --git a/sound/pcmcia/vx/vxp_mixer.c b/sound/pcmcia/vx/vxp_mixer.c index bf9d3b37d6bc..a4a664259f0d 100644 --- a/sound/pcmcia/vx/vxp_mixer.c +++ b/sound/pcmcia/vx/vxp_mixer.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| 25 | #include <sound/control.h> | 24 | #include <sound/control.h> |
| 26 | #include <sound/tlv.h> | 25 | #include <sound/tlv.h> |
diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c index 1ee0918c3b9f..157b0b539f39 100644 --- a/sound/pcmcia/vx/vxp_ops.c +++ b/sound/pcmcia/vx/vxp_ops.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 26 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index c57e127d9ccb..706602a40600 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c index b15bfb6f7011..8441e780df00 100644 --- a/sound/ppc/awacs.c +++ b/sound/ppc/awacs.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <asm/nvram.h> | 24 | #include <asm/nvram.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c index 465dd0466b9f..baa2a7237370 100644 --- a/sound/ppc/beep.c +++ b/sound/ppc/beep.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 23 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index fec74e829743..1a545ac0de04 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index 0c8145792d54..8432c16cd6ff 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 25 | #include <linux/kmod.h> | 24 | #include <linux/kmod.h> |
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index bb7d744faff5..6ff99ed77516 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 8c47bebc77c8..aada1d7dc3c4 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <asm/irq.h> | 24 | #include <asm/irq.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 2264574fa06b..c936225771ba 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index af812dc69ece..d8d0b4b2395a 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/initval.h> | 26 | #include <sound/initval.h> |
| 28 | #include <sound/pcm.h> | 27 | #include <sound/pcm.h> |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index d4d22e161d11..71a7a9765429 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 12c41df255a1..d49417bf78c6 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/timer.h> | 35 | #include <linux/timer.h> |
| 36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 37 | #include <linux/workqueue.h> | 37 | #include <linux/workqueue.h> |
| 38 | #include <sound/driver.h> | ||
| 39 | #include <sound/core.h> | 38 | #include <sound/core.h> |
| 40 | #include <sound/control.h> | 39 | #include <sound/control.h> |
| 41 | #include <sound/pcm.h> | 40 | #include <sound/pcm.h> |
diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c index b39b95a47040..67c88e322fb1 100644 --- a/sound/soc/at91/at91-pcm.c +++ b/sound/soc/at91/at91-pcm.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
| 24 | #include <linux/atmel_pdc.h> | 24 | #include <linux/atmel_pdc.h> |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
| 28 | #include <sound/pcm.h> | 27 | #include <sound/pcm.h> |
| 29 | #include <sound/pcm_params.h> | 28 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c index 3d4e32cff75e..f642d2dd4ec3 100644 --- a/sound/soc/at91/at91-ssc.c +++ b/sound/soc/at91/at91-ssc.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/atmel_pdc.h> | 23 | #include <linux/atmel_pdc.h> |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
| 28 | #include <sound/pcm_params.h> | 27 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c index 820a676c56bf..ad3ad9d662f8 100644 --- a/sound/soc/at91/eti_b1_wm8731.c +++ b/sound/soc/at91/eti_b1_wm8731.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/timer.h> | 28 | #include <linux/timer.h> |
| 29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <sound/driver.h> | ||
| 32 | #include <sound/core.h> | 31 | #include <sound/core.h> |
| 33 | #include <sound/pcm.h> | 32 | #include <sound/pcm.h> |
| 34 | #include <sound/soc.h> | 33 | #include <sound/soc.h> |
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index 0b8a6f8b3668..242130cf1abd 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
| 25 | #include <sound/ac97_codec.h> | 24 | #include <sound/ac97_codec.h> |
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 968eda37754c..bf2ab72d49bf 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <sound/driver.h> | ||
| 32 | #include <sound/core.h> | 31 | #include <sound/core.h> |
| 33 | #include <sound/soc.h> | 32 | #include <sound/soc.h> |
| 34 | #include <sound/initval.h> | 33 | #include <sound/initval.h> |
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index c075a28949f6..710e0287ef8c 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/pm.h> | 39 | #include <linux/pm.h> |
| 40 | #include <linux/i2c.h> | 40 | #include <linux/i2c.h> |
| 41 | #include <linux/platform_device.h> | 41 | #include <linux/platform_device.h> |
| 42 | #include <sound/driver.h> | ||
| 43 | #include <sound/core.h> | 42 | #include <sound/core.h> |
| 44 | #include <sound/pcm.h> | 43 | #include <sound/pcm.h> |
| 45 | #include <sound/pcm_params.h> | 44 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 57fb95a714bf..9c33fe874928 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/pm.h> | 19 | #include <linux/pm.h> |
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
| 25 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index f8797deaf737..77a857b997a2 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/pm.h> | 19 | #include <linux/pm.h> |
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
| 25 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index efced934566d..e6a9b912ba1c 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <linux/pm.h> | 41 | #include <linux/pm.h> |
| 42 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
| 43 | #include <linux/platform_device.h> | 43 | #include <linux/platform_device.h> |
| 44 | #include <sound/driver.h> | ||
| 45 | #include <sound/core.h> | 44 | #include <sound/core.h> |
| 46 | #include <sound/pcm.h> | 45 | #include <sound/pcm.h> |
| 47 | #include <sound/pcm_params.h> | 46 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 427cb61f65a6..9ef8e5c9635a 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/version.h> | 19 | #include <linux/version.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
| 25 | #include <sound/ac97_codec.h> | 24 | #include <sound/ac97_codec.h> |
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 5ee51a994ac3..3f34e531bebf 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
| 28 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 0915cf740421..5ae59bd309a3 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
| 25 | #include <sound/soc.h> | 24 | #include <sound/soc.h> |
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 60e6f4677f93..815c15336255 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/wait.h> | 17 | #include <linux/wait.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <sound/core.h> | 20 | #include <sound/core.h> |
| 22 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
| 23 | #include <sound/ac97_codec.h> | 22 | #include <sound/ac97_codec.h> |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 50c5c83f67db..692b90002489 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <sound/driver.h> | ||
| 22 | #include <sound/core.h> | 21 | #include <sound/core.h> |
| 23 | #include <sound/pcm.h> | 22 | #include <sound/pcm.h> |
| 24 | #include <sound/initval.h> | 23 | #include <sound/initval.h> |
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 35e8fa3a469c..daeaa4c8b876 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 18 | 18 | ||
| 19 | #include <sound/driver.h> | ||
| 20 | #include <sound/core.h> | 19 | #include <sound/core.h> |
| 21 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
| 22 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 4dd8f35312b3..d56709e15435 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
| 28 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 5504e30acf14..e4d40b528ca4 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 27 | 27 | ||
| 28 | #include <sound/driver.h> | ||
| 29 | #include <sound/core.h> | 28 | #include <sound/core.h> |
| 30 | #include <sound/pcm.h> | 29 | #include <sound/pcm.h> |
| 31 | #include <sound/soc.h> | 30 | #include <sound/soc.h> |
diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c index ec0d1a23c18b..9ed8f2e8da10 100644 --- a/sound/soc/s3c24xx/ln2440sbc_alc650.c +++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <sound/driver.h> | ||
| 22 | #include <sound/core.h> | 21 | #include <sound/core.h> |
| 23 | #include <sound/pcm.h> | 22 | #include <sound/pcm.h> |
| 24 | #include <sound/soc.h> | 23 | #include <sound/soc.h> |
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index bde4cdcb433f..6ee115ceb011 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/i2c.h> | 24 | #include <linux/i2c.h> |
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
| 27 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
| 28 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 96605b72e71c..1c1ddbf7f3c0 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
| 25 | 25 | ||
| 26 | #include <sound/driver.h> | ||
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
| 28 | #include <sound/pcm.h> | 27 | #include <sound/pcm.h> |
| 29 | #include <sound/ac97_codec.h> | 28 | #include <sound/ac97_codec.h> |
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 9d8af3a46da8..ff99b76e71a4 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
| 27 | #include <linux/jiffies.h> | 27 | #include <linux/jiffies.h> |
| 28 | #include <sound/driver.h> | ||
| 29 | #include <sound/core.h> | 28 | #include <sound/core.h> |
| 30 | #include <sound/pcm.h> | 29 | #include <sound/pcm.h> |
| 31 | #include <sound/pcm_params.h> | 30 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 4107a87d4de3..290dcf12b5ae 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 26 | 26 | ||
| 27 | #include <sound/driver.h> | ||
| 28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 29 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
| 30 | #include <sound/pcm_params.h> | 29 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index d46cd811ceb3..b4a56302b9ab 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 20 | #include <sound/driver.h> | ||
| 21 | #include <sound/core.h> | 20 | #include <sound/core.h> |
| 22 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
| 23 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index cdee374b843e..7a3ce80d6727 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 19 | #include <sound/driver.h> | ||
| 20 | #include <sound/core.h> | 19 | #include <sound/core.h> |
| 21 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
| 22 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 34b77b9fbb9c..b7b676b3d671 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/wait.h> | 22 | #include <linux/wait.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <sound/driver.h> | ||
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 26 | #include <sound/pcm.h> | 25 | #include <sound/pcm.h> |
| 27 | #include <sound/ac97_codec.h> | 26 | #include <sound/ac97_codec.h> |
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index 5563f14511fa..2f91de84c5c7 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/moduleparam.h> | 10 | #include <linux/moduleparam.h> |
| 11 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 12 | #include <sound/driver.h> | ||
| 13 | #include <sound/core.h> | 12 | #include <sound/core.h> |
| 14 | #include <sound/pcm.h> | 13 | #include <sound/pcm.h> |
| 15 | #include <sound/soc.h> | 14 | #include <sound/soc.h> |
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index b72bc316cb8e..3388bc3d62d1 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <sound/driver.h> | ||
| 34 | #include <sound/core.h> | 33 | #include <sound/core.h> |
| 35 | #include <sound/pcm.h> | 34 | #include <sound/pcm.h> |
| 36 | #include <sound/initval.h> | 35 | #include <sound/initval.h> |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e6a67b58f296..94075256638c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/pm.h> | 32 | #include <linux/pm.h> |
| 33 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <sound/driver.h> | ||
| 36 | #include <sound/core.h> | 35 | #include <sound/core.h> |
| 37 | #include <sound/pcm.h> | 36 | #include <sound/pcm.h> |
| 38 | #include <sound/pcm_params.h> | 37 | #include <sound/pcm_params.h> |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 29a546fecacf..3b8f94af7e27 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include <linux/bitops.h> | 43 | #include <linux/bitops.h> |
| 44 | #include <linux/platform_device.h> | 44 | #include <linux/platform_device.h> |
| 45 | #include <linux/jiffies.h> | 45 | #include <linux/jiffies.h> |
| 46 | #include <sound/driver.h> | ||
| 47 | #include <sound/core.h> | 46 | #include <sound/core.h> |
| 48 | #include <sound/pcm.h> | 47 | #include <sound/pcm.h> |
| 49 | #include <sound/pcm_params.h> | 48 | #include <sound/pcm_params.h> |
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index b1d431587158..0c63e0585b15 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 37 | #include <linux/moduleparam.h> | 37 | #include <linux/moduleparam.h> |
| 38 | 38 | ||
| 39 | #include <sound/driver.h> | ||
| 40 | #include <sound/core.h> | 39 | #include <sound/core.h> |
| 41 | #include <sound/pcm.h> | 40 | #include <sound/pcm.h> |
| 42 | #include <sound/info.h> | 41 | #include <sound/info.h> |
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index f8c7a120ccbb..1c4797be72ee 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
| 25 | #include <sound/info.h> | 24 | #include <sound/info.h> |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index fc683174f2c7..3d00e0797b11 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | * other DBRI low-level stuff | 53 | * other DBRI low-level stuff |
| 54 | */ | 54 | */ |
| 55 | 55 | ||
| 56 | #include <sound/driver.h> | ||
| 57 | #include <linux/interrupt.h> | 56 | #include <linux/interrupt.h> |
| 58 | #include <linux/delay.h> | 57 | #include <linux/delay.h> |
| 59 | #include <linux/irq.h> | 58 | #include <linux/irq.h> |
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index 5e8cf9f44ca3..89d6e9c35140 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <sound/initval.h> | 25 | #include <sound/initval.h> |
| 27 | #include <sound/control.h> | 26 | #include <sound/control.h> |
| 28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index ebcac13fd397..c89d2ea594b9 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/string.h> | 23 | #include <linux/string.h> |
diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c index 9b63814c3f64..0a5391436add 100644 --- a/sound/synth/emux/emux_hwdep.c +++ b/sound/synth/emux/emux_hwdep.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <sound/driver.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/hwdep.h> | 23 | #include <sound/hwdep.h> |
| 25 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index 3436816727c8..f60a98ef7dec 100644 --- a/sound/synth/emux/emux_oss.c +++ b/sound/synth/emux/emux_oss.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * midi emulation. | 22 | * midi emulation. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | 25 | ||
| 27 | #ifdef CONFIG_SND_SEQUENCER_OSS | 26 | #ifdef CONFIG_SND_SEQUENCER_OSS |
| 28 | 27 | ||
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c index 680f2b7fec20..687e6a13689e 100644 --- a/sound/synth/emux/emux_proc.c +++ b/sound/synth/emux/emux_proc.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <sound/driver.h> | ||
| 22 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
diff --git a/sound/synth/emux/emux_voice.h b/sound/synth/emux/emux_voice.h index 0a56ca18b165..09711f84ed30 100644 --- a/sound/synth/emux/emux_voice.h +++ b/sound/synth/emux/emux_voice.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <sound/driver.h> | ||
| 26 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 455e535933ec..36d53bd317ed 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * of doing things so that the old sfxload utility can be used. | 25 | * of doing things so that the old sfxload utility can be used. |
| 26 | * Everything may change when there is an alsa way of doing things. | 26 | * Everything may change when there is an alsa way of doing things. |
| 27 | */ | 27 | */ |
| 28 | #include <sound/driver.h> | ||
| 29 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 31 | #include <sound/core.h> | 30 | #include <sound/core.h> |
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c index 6fc3d2b2519f..deabe5f899c4 100644 --- a/sound/synth/util_mem.c +++ b/sound/synth/util_mem.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <sound/driver.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c index bf551c08c2ec..f7e5284b8620 100644 --- a/sound/usb/caiaq/caiaq-audio.c +++ b/sound/usb/caiaq/caiaq-audio.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <sound/driver.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
diff --git a/sound/usb/caiaq/caiaq-control.c b/sound/usb/caiaq/caiaq-control.c index 7d25f4b25534..798ca124da58 100644 --- a/sound/usb/caiaq/caiaq-control.c +++ b/sound/usb/caiaq/caiaq-control.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <sound/driver.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 23 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c index 48c6bedfe0f2..5cd92ae3cd16 100644 --- a/sound/usb/caiaq/caiaq-device.c +++ b/sound/usb/caiaq/caiaq-device.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/usb.h> | 26 | #include <linux/usb.h> |
| 27 | #include <linux/input.h> | 27 | #include <linux/input.h> |
| 28 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
| 29 | #include <sound/driver.h> | ||
| 30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
| 31 | #include <sound/initval.h> | 30 | #include <sound/initval.h> |
| 32 | #include <sound/pcm.h> | 31 | #include <sound/pcm.h> |
diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c index e6c410ab76f4..f743847a5e5a 100644 --- a/sound/usb/caiaq/caiaq-input.c +++ b/sound/usb/caiaq/caiaq-input.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 24 | #include <linux/usb/input.h> | 24 | #include <linux/usb/input.h> |
| 25 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 26 | #include <sound/driver.h> | ||
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
| 28 | #include <sound/rawmidi.h> | 27 | #include <sound/rawmidi.h> |
| 29 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
diff --git a/sound/usb/caiaq/caiaq-midi.c b/sound/usb/caiaq/caiaq-midi.c index 793ca20ce349..54270328be52 100644 --- a/sound/usb/caiaq/caiaq-midi.c +++ b/sound/usb/caiaq/caiaq-midi.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 26 | #include <sound/driver.h> | ||
| 27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
| 28 | #include <sound/rawmidi.h> | 27 | #include <sound/rawmidi.h> |
| 29 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index c6d628a3127c..8fa935665702 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | #include <sound/driver.h> | ||
| 42 | #include <linux/bitops.h> | 41 | #include <linux/bitops.h> |
| 43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 44 | #include <linux/list.h> | 43 | #include <linux/list.h> |
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index 6330788c1c2b..750e929d5870 100644 --- a/sound/usb/usbmidi.c +++ b/sound/usb/usbmidi.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * SUCH DAMAGE. | 35 | * SUCH DAMAGE. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <sound/driver.h> | ||
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 41 | #include <linux/bitops.h> | 40 | #include <linux/bitops.h> |
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 1f1e91cee3fe..89c63d073cc6 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <sound/driver.h> | ||
| 30 | #include <linux/bitops.h> | 29 | #include <linux/bitops.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/list.h> | 31 | #include <linux/list.h> |
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c index a1dca3441319..6495534e5bf6 100644 --- a/sound/usb/usx2y/usX2Yhwdep.c +++ b/sound/usb/usx2y/usX2Yhwdep.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/driver.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
| 26 | #include <sound/core.h> | 25 | #include <sound/core.h> |
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index e011fcacce92..e5981a630314 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c | |||
| @@ -130,7 +130,6 @@ | |||
| 130 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 130 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 131 | */ | 131 | */ |
| 132 | 132 | ||
| 133 | #include <sound/driver.h> | ||
| 134 | #include <linux/init.h> | 133 | #include <linux/init.h> |
| 135 | #include <linux/module.h> | 134 | #include <linux/module.h> |
| 136 | #include <linux/moduleparam.h> | 135 | #include <linux/moduleparam.h> |
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 48e9aa3f18c9..9a608fa85155 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | #include <sound/driver.h> | ||
| 35 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 36 | #include <linux/usb.h> | 35 | #include <linux/usb.h> |
| 37 | #include <sound/core.h> | 36 | #include <sound/core.h> |