diff options
Diffstat (limited to 'sound')
31 files changed, 4 insertions, 33 deletions
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index b88fb0c5a68a..c79a9afd0955 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 <linux/config.h> | ||
63 | #include <sound/driver.h> | 62 | #include <sound/driver.h> |
64 | #include <linux/module.h> | 63 | #include <linux/module.h> |
65 | #include <linux/moduleparam.h> | 64 | #include <linux/moduleparam.h> |
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 3fc6f97075ed..bc0bd0910a62 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c | |||
@@ -21,7 +21,6 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
26 | #include <linux/proc_fs.h> | 25 | #include <linux/proc_fs.h> |
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c index 74745da9deb6..6e4d4ab34632 100644 --- a/sound/core/sgbuf.c +++ b/sound/core/sgbuf.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/config.h> | ||
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
25 | #include <linux/vmalloc.h> | 24 | #include <linux/vmalloc.h> |
diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c index 95586de02028..29057836c644 100644 --- a/sound/oss/ad1816.c +++ b/sound/oss/ad1816.c | |||
@@ -41,7 +41,6 @@ | |||
41 | */ | 41 | */ |
42 | 42 | ||
43 | 43 | ||
44 | #include <linux/config.h> | ||
45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
46 | #include <linux/init.h> | 45 | #include <linux/init.h> |
47 | #include <linux/interrupt.h> | 46 | #include <linux/interrupt.h> |
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index e04fa49b0dc8..3b45e11e5303 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c | |||
@@ -41,7 +41,6 @@ | |||
41 | * Tested. Believed fully functional. | 41 | * Tested. Believed fully functional. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <linux/config.h> | ||
45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
46 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c index a4ca7569e700..0b09b8b4ec7d 100644 --- a/sound/oss/ad1889.c +++ b/sound/oss/ad1889.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * | 26 | * |
27 | * $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $ | 27 | * $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $ |
28 | */ | 28 | */ |
29 | #include <linux/config.h> | ||
30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c index b556263a57f5..51e1fde62e8d 100644 --- a/sound/oss/aedsp16.c +++ b/sound/oss/aedsp16.c | |||
@@ -23,7 +23,6 @@ | |||
23 | * Include the main OSS Lite header file. It include all the os, OSS Lite, etc | 23 | * Include the main OSS Lite header file. It include all the os, OSS Lite, etc |
24 | * headers needed by this source. | 24 | * headers needed by this source. |
25 | */ | 25 | */ |
26 | #include <linux/config.h> | ||
27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c index 80f6c08e26e7..b6924c7f1484 100644 --- a/sound/oss/cs4232.c +++ b/sound/oss/cs4232.c | |||
@@ -47,7 +47,6 @@ | |||
47 | * Marcus Meissner Added ISA PnP support. | 47 | * Marcus Meissner Added ISA PnP support. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #include <linux/config.h> | ||
51 | #include <linux/pnp.h> | 50 | #include <linux/pnp.h> |
52 | #include <linux/module.h> | 51 | #include <linux/module.h> |
53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index baf4244a54f2..15ce7119c5f4 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c | |||
@@ -547,7 +547,7 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap) | |||
547 | } | 547 | } |
548 | return 0; | 548 | return 0; |
549 | } | 549 | } |
550 | /* aquires lock */ | 550 | /* acquires lock */ |
551 | int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) | 551 | int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) |
552 | { | 552 | { |
553 | struct audio_operations *adev = audio_devs[dev]; | 553 | struct audio_operations *adev = audio_devs[dev]; |
@@ -821,7 +821,7 @@ static int find_output_space(int dev, char **buf, int *size) | |||
821 | *size = len & ~SAMPLE_ROUNDUP; | 821 | *size = len & ~SAMPLE_ROUNDUP; |
822 | return (*size > 0); | 822 | return (*size > 0); |
823 | } | 823 | } |
824 | /* aquires lock */ | 824 | /* acquires lock */ |
825 | int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) | 825 | int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) |
826 | { | 826 | { |
827 | struct audio_operations *adev = audio_devs[dev]; | 827 | struct audio_operations *adev = audio_devs[dev]; |
@@ -855,7 +855,7 @@ int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) | |||
855 | spin_unlock_irqrestore(&dmap->lock,flags); | 855 | spin_unlock_irqrestore(&dmap->lock,flags); |
856 | return 0; | 856 | return 0; |
857 | } | 857 | } |
858 | /* has to aquire dmap->lock */ | 858 | /* has to acquire dmap->lock */ |
859 | int DMAbuf_move_wrpointer(int dev, int l) | 859 | int DMAbuf_move_wrpointer(int dev, int l) |
860 | { | 860 | { |
861 | struct audio_operations *adev = audio_devs[dev]; | 861 | struct audio_operations *adev = audio_devs[dev]; |
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index a1b0b92af4b5..25dd5a318eb4 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #define _dmasound_h_ | 13 | #define _dmasound_h_ |
14 | 14 | ||
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | #include <linux/config.h> | ||
17 | 16 | ||
18 | #define SND_NDEVS 256 /* Number of supported devices */ | 17 | #define SND_NDEVS 256 /* Number of supported devices */ |
19 | #define SND_DEV_CTL 0 /* Control port /dev/mixer */ | 18 | #define SND_DEV_CTL 0 /* Control port /dev/mixer */ |
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index c8e210326893..de454ca39226 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -67,7 +67,6 @@ | |||
67 | 67 | ||
68 | #include <linux/types.h> | 68 | #include <linux/types.h> |
69 | #include <linux/module.h> | 69 | #include <linux/module.h> |
70 | #include <linux/config.h> | ||
71 | #include <linux/slab.h> | 70 | #include <linux/slab.h> |
72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
73 | #include <linux/delay.h> | 72 | #include <linux/delay.h> |
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 494070a3f870..68e1d8f6c359 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | 17 | ||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/config.h> | ||
20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index 2835a7c038ef..12e7b3038be2 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * same manner. | 27 | * same manner. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/config.h> | ||
31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
diff --git a/sound/oss/msnd_classic.h b/sound/oss/msnd_classic.h index 83c3c46ffffe..7ffea5267f96 100644 --- a/sound/oss/msnd_classic.h +++ b/sound/oss/msnd_classic.h | |||
@@ -30,7 +30,6 @@ | |||
30 | #ifndef __MSND_CLASSIC_H | 30 | #ifndef __MSND_CLASSIC_H |
31 | #define __MSND_CLASSIC_H | 31 | #define __MSND_CLASSIC_H |
32 | 32 | ||
33 | #include <linux/config.h> | ||
34 | 33 | ||
35 | #define DSP_NUMIO 0x10 | 34 | #define DSP_NUMIO 0x10 |
36 | 35 | ||
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index 0c2db657badd..6d7763dae895 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c | |||
@@ -39,7 +39,6 @@ | |||
39 | ********************************************************************/ | 39 | ********************************************************************/ |
40 | 40 | ||
41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
42 | #include <linux/config.h> | ||
43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
44 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
45 | #include <linux/types.h> | 44 | #include <linux/types.h> |
diff --git a/sound/oss/msnd_pinnacle.h b/sound/oss/msnd_pinnacle.h index e85aef4a55e0..cce911487004 100644 --- a/sound/oss/msnd_pinnacle.h +++ b/sound/oss/msnd_pinnacle.h | |||
@@ -30,7 +30,6 @@ | |||
30 | #ifndef __MSND_PINNACLE_H | 30 | #ifndef __MSND_PINNACLE_H |
31 | #define __MSND_PINNACLE_H | 31 | #define __MSND_PINNACLE_H |
32 | 32 | ||
33 | #include <linux/config.h> | ||
34 | 33 | ||
35 | #define DSP_NUMIO 0x08 | 34 | #define DSP_NUMIO 0x08 |
36 | 35 | ||
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c index 0e161c6a0477..aec05a2bfc87 100644 --- a/sound/oss/opl3sa2.c +++ b/sound/oss/opl3sa2.c | |||
@@ -64,7 +64,6 @@ | |||
64 | * | 64 | * |
65 | */ | 65 | */ |
66 | 66 | ||
67 | #include <linux/config.h> | ||
68 | #include <linux/pnp.h> | 67 | #include <linux/pnp.h> |
69 | #include <linux/init.h> | 68 | #include <linux/init.h> |
70 | #include <linux/module.h> | 69 | #include <linux/module.h> |
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index c9696dc9fdf9..97666007b274 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * Detection routine for the Pro Audio Spectrum cards. | 4 | * Detection routine for the Pro Audio Spectrum cards. |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/config.h> | ||
8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
9 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index a617ccb40e00..37ee234b587c 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c | |||
@@ -57,7 +57,6 @@ | |||
57 | */ | 57 | */ |
58 | 58 | ||
59 | 59 | ||
60 | #include <linux/config.h> | ||
61 | #include <linux/init.h> | 60 | #include <linux/init.h> |
62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
63 | #include <linux/spinlock.h> | 62 | #include <linux/spinlock.h> |
diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c index 4708cbdc3149..8666291c0052 100644 --- a/sound/oss/sb_card.c +++ b/sound/oss/sb_card.c | |||
@@ -22,7 +22,6 @@ | |||
22 | * 02-07-2003 Bug made it into first release. Take two. | 22 | * 02-07-2003 Bug made it into first release. Take two. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/config.h> | ||
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c index 5f955e3d2e26..3e8ecac86a89 100644 --- a/sound/oss/sb_common.c +++ b/sound/oss/sb_common.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * Chris Rankin <rankinc@zipworld.com.au> | 26 | * Chris Rankin <rankinc@zipworld.com.au> |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <linux/config.h> | ||
30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index 3f7427cd195a..cbf745db4b10 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c | |||
@@ -1,4 +1,3 @@ | |||
1 | #include <linux/config.h> | ||
2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
4 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h index 9f912b8a2969..1a00a3210616 100644 --- a/sound/oss/sound_config.h +++ b/sound/oss/sound_config.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifndef _SOUND_CONFIG_H_ | 14 | #ifndef _SOUND_CONFIG_H_ |
15 | #define _SOUND_CONFIG_H_ | 15 | #define _SOUND_CONFIG_H_ |
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
19 | #include <linux/sound.h> | 18 | #include <linux/sound.h> |
20 | 19 | ||
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index a33289948902..0860d6789715 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
@@ -22,7 +22,6 @@ | |||
22 | * Christoph Hellwig : Some cleanup work (2000/03/01) | 22 | * Christoph Hellwig : Some cleanup work (2000/03/01) |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/config.h> | ||
26 | 25 | ||
27 | #include "sound_config.h" | 26 | #include "sound_config.h" |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index e61a454a8150..420a866fb933 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
@@ -194,7 +194,6 @@ | |||
194 | * sem - guard dmabuf, write re-entry etc | 194 | * sem - guard dmabuf, write re-entry etc |
195 | */ | 195 | */ |
196 | 196 | ||
197 | #include <linux/config.h> | ||
198 | #include <linux/module.h> | 197 | #include <linux/module.h> |
199 | #include <linux/string.h> | 198 | #include <linux/string.h> |
200 | #include <linux/ctype.h> | 199 | #include <linux/ctype.h> |
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index 29a6e0cff79f..3ada26b3fc7e 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #define VIA_VERSION "1.9.1-ac4-2.5" | 18 | #define VIA_VERSION "1.9.1-ac4-2.5" |
19 | 19 | ||
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
24 | #include <linux/fs.h> | 23 | #include <linux/fs.h> |
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 00fe5cec9dc1..8932d89408ef 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * We currently support a mixer device, but it is currently non-functional. | 17 | * We currently support a mixer device, but it is currently non-functional. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index afcb524a40eb..22d26624b34a 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
38 | #include <linux/config.h> | ||
39 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
40 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
41 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
diff --git a/sound/sound_core.c b/sound/sound_core.c index 7535ec821dcf..62d4d0c81261 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c | |||
@@ -34,7 +34,6 @@ | |||
34 | * locking at some point in 2.3.x. | 34 | * locking at some point in 2.3.x. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/config.h> | ||
38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
40 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index d9d14c2707db..44ad9616bf63 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -8,7 +8,6 @@ | |||
8 | * Copyright (c) by Jaroslav Kysela <perex@suse.cz> | 8 | * Copyright (c) by Jaroslav Kysela <perex@suse.cz> |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/config.h> | ||
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index a7489a3dd75a..63bef0aadf1e 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * | 46 | * |
47 | * I've tried to stick to the following function naming conventions: | 47 | * I've tried to stick to the following function naming conventions: |
48 | * snd_* ALSA stuff | 48 | * snd_* ALSA stuff |
49 | * cs4215_* CS4215 codec specfic stuff | 49 | * cs4215_* CS4215 codec specific stuff |
50 | * dbri_* DBRI high-level stuff | 50 | * dbri_* DBRI high-level stuff |
51 | * other DBRI low-level stuff | 51 | * other DBRI low-level stuff |
52 | */ | 52 | */ |