diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-10-18 02:14:50 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-10-18 02:14:50 -0400 |
commit | de3ab850a0e883329594f62ec18fecef4fcfe5ca (patch) | |
tree | 809cdaec9635b81ec1c4eb3537f876c4c64b38c4 /sound/pci/ice1712 | |
parent | 34a9318772d00efc5c1af00639526232050c49b8 (diff) |
ALSA: ice17xx: Fix inclusion of linux/io.h
Include linux/io.h in ice1712.h since inb() and outb() are used in
inline functions there. Remove the redundant inclusion of that file
in other places at the same time.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/amp.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/aureon.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/delta.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/ews.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/hoontech.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1712.h | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/juli.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/maya44.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/phase.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/pontis.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/prodigy192.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/prodigy_hifi.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/quartet.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/revo.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/se.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/vt1720_mobo.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/wtm.c | 1 |
19 files changed, 1 insertions, 18 deletions
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c index e525da2673be..d9bd27b25100 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 <asm/io.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/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 2d6bf80cb060..ce9941c5e988 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
@@ -46,7 +46,6 @@ | |||
46 | * on mixer switch and other coll stuff. | 46 | * on mixer switch and other coll stuff. |
47 | */ | 47 | */ |
48 | 48 | ||
49 | #include <linux/io.h> | ||
50 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
51 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |
52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index 20c6b079d0df..bbef99bf77df 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 <asm/io.h> | ||
26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c index 0b470841ed02..bf289f0a1ed4 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 <asm/io.h> | ||
26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c index 6914189073a4..3d84d21e484d 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 <asm/io.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/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index f42b5b1c1d24..dd64e223f5cf 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 <linux/io.h> | ||
51 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
52 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index e8b7c5ecfe00..b209fc30b334 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
@@ -22,6 +22,7 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/io.h> | ||
25 | #include <sound/control.h> | 26 | #include <sound/control.h> |
26 | #include <sound/ac97_codec.h> | 27 | #include <sound/ac97_codec.h> |
27 | #include <sound/rawmidi.h> | 28 | #include <sound/rawmidi.h> |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index e7369f4cca76..58b4b6f85db3 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 <linux/io.h> | ||
26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index e6047491ff16..a6b23b421512 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
@@ -23,7 +23,6 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <asm/io.h> | ||
27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c index 9729c322115c..d8d749e5ed41 100644 --- a/sound/pci/ice1712/maya44.c +++ b/sound/pci/ice1712/maya44.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/io.h> | ||
28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
29 | #include <sound/control.h> | 28 | #include <sound/control.h> |
30 | #include <sound/pcm.h> | 29 | #include <sound/pcm.h> |
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c index 79204e20266e..c9be75a457c3 100644 --- a/sound/pci/ice1712/phase.c +++ b/sound/pci/ice1712/phase.c | |||
@@ -42,7 +42,6 @@ | |||
42 | * Digital receiver: CS8414-CS (supported in this release) | 42 | * Digital receiver: CS8414-CS (supported in this release) |
43 | */ | 43 | */ |
44 | 44 | ||
45 | #include <asm/io.h> | ||
46 | #include <linux/delay.h> | 45 | #include <linux/delay.h> |
47 | #include <linux/interrupt.h> | 46 | #include <linux/interrupt.h> |
48 | #include <linux/init.h> | 47 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index 92c1160d7ab5..3ce1289263a3 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 <asm/io.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/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index fd739c4c9cf1..3fcf581e7ef8 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 <asm/io.h> | ||
58 | #include <linux/delay.h> | 57 | #include <linux/delay.h> |
59 | #include <linux/interrupt.h> | 58 | #include <linux/interrupt.h> |
60 | #include <linux/init.h> | 59 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c index 7bf093c51ce5..4fea87fb5799 100644 --- a/sound/pci/ice1712/prodigy_hifi.c +++ b/sound/pci/ice1712/prodigy_hifi.c | |||
@@ -25,7 +25,6 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | 27 | ||
28 | #include <asm/io.h> | ||
29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c index 462ef6716754..c85b2ff79115 100644 --- a/sound/pci/ice1712/quartet.c +++ b/sound/pci/ice1712/quartet.c | |||
@@ -22,7 +22,6 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <asm/io.h> | ||
26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index b508bb360b97..a1b79758766b 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 <asm/io.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/ice1712/se.c b/sound/pci/ice1712/se.c index 62d0fc90abfb..53b555f5bbea 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 <asm/io.h> | ||
26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c index 4c551e147c08..8a0a8393ad9e 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 <asm/io.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/ice1712/wtm.c b/sound/pci/ice1712/wtm.c index e618f789026e..184163bbd732 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 <linux/io.h> | ||
29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
31 | #include <linux/init.h> | 30 | #include <linux/init.h> |