diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/init.c | 1 | ||||
-rw-r--r-- | sound/oss/au1550_ac97.c | 1 | ||||
-rw-r--r-- | sound/oss/soundcard.c | 1 | ||||
-rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 2 | ||||
-rw-r--r-- | sound/pci/ca0106/ca0106_proc.c | 2 | ||||
-rw-r--r-- | sound/pci/cs46xx/dsp_spos.c | 1 | ||||
-rw-r--r-- | sound/pci/cs46xx/dsp_spos_scb_lib.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/hda_generic.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/hda_proc.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_atihdmi.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_si3054.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_via.c | 1 |
12 files changed, 3 insertions, 11 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 4a431e3ea3a2..f2fe35737186 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/time.h> | 27 | #include <linux/time.h> |
28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
29 | #include <linux/pci.h> | ||
30 | #include <linux/pm.h> | 29 | #include <linux/pm.h> |
31 | 30 | ||
32 | #include <sound/core.h> | 31 | #include <sound/core.h> |
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index a339f0c0d512..23018a7c063a 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/interrupt.h> | 47 | #include <linux/interrupt.h> |
48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
49 | #include <linux/poll.h> | 49 | #include <linux/poll.h> |
50 | #include <linux/pci.h> | ||
51 | #include <linux/bitops.h> | 50 | #include <linux/bitops.h> |
52 | #include <linux/spinlock.h> | 51 | #include <linux/spinlock.h> |
53 | #include <linux/smp_lock.h> | 52 | #include <linux/smp_lock.h> |
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index dcd8d6d2f56f..a9c23b2502ad 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/smp_lock.h> | 44 | #include <linux/smp_lock.h> |
45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
46 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |
47 | #include <linux/device.h> | ||
47 | 48 | ||
48 | /* | 49 | /* |
49 | * This ought to be moved into include/asm/dma.h | 50 | * This ought to be moved into include/asm/dma.h |
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index b913a1fb8c21..9c3a9c8d1dc2 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include <linux/delay.h> | 62 | #include <linux/delay.h> |
63 | #include <linux/init.h> | 63 | #include <linux/init.h> |
64 | #include <linux/interrupt.h> | 64 | #include <linux/interrupt.h> |
65 | #include <linux/pci.h> | ||
66 | #include <linux/slab.h> | 65 | #include <linux/slab.h> |
67 | #include <linux/moduleparam.h> | 66 | #include <linux/moduleparam.h> |
68 | #include <sound/core.h> | 67 | #include <sound/core.h> |
@@ -71,6 +70,7 @@ | |||
71 | #include <sound/ac97_codec.h> | 70 | #include <sound/ac97_codec.h> |
72 | #include <sound/info.h> | 71 | #include <sound/info.h> |
73 | #include <sound/tlv.h> | 72 | #include <sound/tlv.h> |
73 | #include <asm/io.h> | ||
74 | 74 | ||
75 | #include "ca0106.h" | 75 | #include "ca0106.h" |
76 | 76 | ||
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c index 75ca421eb3a1..ae80f51d8c4f 100644 --- a/sound/pci/ca0106/ca0106_proc.c +++ b/sound/pci/ca0106/ca0106_proc.c | |||
@@ -64,7 +64,6 @@ | |||
64 | #include <linux/delay.h> | 64 | #include <linux/delay.h> |
65 | #include <linux/init.h> | 65 | #include <linux/init.h> |
66 | #include <linux/interrupt.h> | 66 | #include <linux/interrupt.h> |
67 | #include <linux/pci.h> | ||
68 | #include <linux/slab.h> | 67 | #include <linux/slab.h> |
69 | #include <linux/moduleparam.h> | 68 | #include <linux/moduleparam.h> |
70 | #include <sound/core.h> | 69 | #include <sound/core.h> |
@@ -73,6 +72,7 @@ | |||
73 | #include <sound/ac97_codec.h> | 72 | #include <sound/ac97_codec.h> |
74 | #include <sound/info.h> | 73 | #include <sound/info.h> |
75 | #include <sound/asoundef.h> | 74 | #include <sound/asoundef.h> |
75 | #include <asm/io.h> | ||
76 | 76 | ||
77 | #include "ca0106.h" | 77 | #include "ca0106.h" |
78 | 78 | ||
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c index 89c402770a1d..336e77e2600c 100644 --- a/sound/pci/cs46xx/dsp_spos.c +++ b/sound/pci/cs46xx/dsp_spos.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <sound/driver.h> | 23 | #include <sound/driver.h> |
24 | #include <asm/io.h> | 24 | #include <asm/io.h> |
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <linux/pci.h> | ||
27 | #include <linux/pm.h> | 26 | #include <linux/pm.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/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c index 343f51d5311b..57e357de1500 100644 --- a/sound/pci/cs46xx/dsp_spos_scb_lib.c +++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <sound/driver.h> | 24 | #include <sound/driver.h> |
25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/pci.h> | ||
28 | #include <linux/pm.h> | 27 | #include <linux/pm.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 1589d2f2917f..1e5ff0cd3709 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <sound/driver.h> | 23 | #include <sound/driver.h> |
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/pci.h> | ||
27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
28 | #include "hda_codec.h" | 27 | #include "hda_codec.h" |
29 | #include "hda_local.h" | 28 | #include "hda_local.h" |
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 17df4d0fe135..e313e685f161 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include <sound/driver.h> | 24 | #include <sound/driver.h> |
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/pci.h> | ||
27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
28 | #include "hda_codec.h" | 27 | #include "hda_codec.h" |
29 | #include "hda_local.h" | 28 | #include "hda_local.h" |
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c index 7333f275decd..831469d3a923 100644 --- a/sound/pci/hda/patch_atihdmi.c +++ b/sound/pci/hda/patch_atihdmi.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
28 | #include <linux/pci.h> | ||
29 | #include <sound/core.h> | 28 | #include <sound/core.h> |
30 | #include "hda_codec.h" | 29 | #include "hda_codec.h" |
31 | #include "hda_local.h" | 30 | #include "hda_local.h" |
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index ed5e45e35963..6fcda9bcf0cf 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/pci.h> | ||
30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
31 | #include "hda_codec.h" | 30 | #include "hda_codec.h" |
32 | #include "hda_local.h" | 31 | #include "hda_local.h" |
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 4c839b031729..2b11ac8689b9 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <linux/pci.h> | ||
39 | #include <sound/core.h> | 38 | #include <sound/core.h> |
40 | #include "hda_codec.h" | 39 | #include "hda_codec.h" |
41 | #include "hda_local.h" | 40 | #include "hda_local.h" |