diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 1 | ||||
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 2 | ||||
-rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 3 | ||||
-rw-r--r-- | sound/soc/pxa/corgi.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/e800_wm9712.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/em-x270.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/spitz.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/tosa.c | 2 |
9 files changed, 1 insertions, 17 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 35afd0c33be5..718d06640dd4 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <sound/pxa2xx-lib.h> | 21 | #include <sound/pxa2xx-lib.h> |
22 | 22 | ||
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/regs-ac97.h> | 24 | #include <mach/regs-ac97.h> |
26 | #include <mach/pxa2xx-gpio.h> | 25 | #include <mach/pxa2xx-gpio.h> |
27 | #include <mach/audio.h> | 26 | #include <mach/audio.h> |
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 85cf591d4e11..ccec48fc8e3f 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -20,8 +20,6 @@ | |||
20 | #include <sound/initval.h> | 20 | #include <sound/initval.h> |
21 | #include <sound/pxa2xx-lib.h> | 21 | #include <sound/pxa2xx-lib.h> |
22 | 22 | ||
23 | #include <mach/hardware.h> | ||
24 | #include <mach/pxa-regs.h> | ||
25 | #include <mach/regs-ac97.h> | 23 | #include <mach/regs-ac97.h> |
26 | #include <mach/audio.h> | 24 | #include <mach/audio.h> |
27 | 25 | ||
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 75a0d746fb60..108b643229ba 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c | |||
@@ -12,8 +12,7 @@ | |||
12 | #include <sound/pcm_params.h> | 12 | #include <sound/pcm_params.h> |
13 | #include <sound/pxa2xx-lib.h> | 13 | #include <sound/pxa2xx-lib.h> |
14 | 14 | ||
15 | #include <asm/dma.h> | 15 | #include <mach/dma.h> |
16 | #include <mach/pxa-regs.h> | ||
17 | 16 | ||
18 | #include "pxa2xx-pcm.h" | 17 | #include "pxa2xx-pcm.h" |
19 | 18 | ||
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 1ba25a559524..ec930667feff 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <sound/soc-dapm.h> | 25 | #include <sound/soc-dapm.h> |
26 | 26 | ||
27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | #include <mach/pxa-regs.h> | ||
29 | #include <mach/hardware.h> | ||
30 | #include <mach/corgi.h> | 28 | #include <mach/corgi.h> |
31 | #include <mach/audio.h> | 29 | #include <mach/audio.h> |
32 | 30 | ||
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 2e3386dfa0f0..ac294c797b7d 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <sound/soc-dapm.h> | 21 | #include <sound/soc-dapm.h> |
22 | 22 | ||
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | #include <mach/pxa-regs.h> | ||
25 | #include <mach/hardware.h> | ||
26 | #include <mach/audio.h> | 24 | #include <mach/audio.h> |
27 | 25 | ||
28 | #include "../codecs/wm9712.h" | 26 | #include "../codecs/wm9712.h" |
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index fe4a729ea648..949be9c2a01b 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
@@ -29,8 +29,6 @@ | |||
29 | #include <sound/soc-dapm.h> | 29 | #include <sound/soc-dapm.h> |
30 | 30 | ||
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <mach/pxa-regs.h> | ||
33 | #include <mach/hardware.h> | ||
34 | #include <mach/audio.h> | 32 | #include <mach/audio.h> |
35 | 33 | ||
36 | #include "../codecs/wm9712.h" | 34 | #include "../codecs/wm9712.h" |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6e9827189fff..cad2c4c0ac95 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -26,8 +26,6 @@ | |||
26 | 26 | ||
27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | #include <asm/hardware/locomo.h> | 28 | #include <asm/hardware/locomo.h> |
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/hardware.h> | ||
31 | #include <mach/poodle.h> | 29 | #include <mach/poodle.h> |
32 | #include <mach/audio.h> | 30 | #include <mach/audio.h> |
33 | 31 | ||
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index a3b9e6bdf979..de8778fa8729 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -26,8 +26,6 @@ | |||
26 | #include <sound/soc-dapm.h> | 26 | #include <sound/soc-dapm.h> |
27 | 27 | ||
28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/hardware.h> | ||
31 | #include <mach/spitz.h> | 29 | #include <mach/spitz.h> |
32 | #include "../codecs/wm8750.h" | 30 | #include "../codecs/wm8750.h" |
33 | #include "pxa2xx-pcm.h" | 31 | #include "pxa2xx-pcm.h" |
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index c77194f74c9b..050223d04e54 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -30,8 +30,6 @@ | |||
30 | 30 | ||
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <mach/tosa.h> | 32 | #include <mach/tosa.h> |
33 | #include <mach/pxa-regs.h> | ||
34 | #include <mach/hardware.h> | ||
35 | #include <mach/audio.h> | 33 | #include <mach/audio.h> |
36 | 34 | ||
37 | #include "../codecs/wm9712.h" | 35 | #include "../codecs/wm9712.h" |