diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/ep93xx/ep93xx-ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/ep93xx/ep93xx-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/ep93xx/ep93xx-pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/imx-pcm-dma.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/imx-pcm-fiq.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/imx-ssi.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/imx-ssi.h | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-openrd.c | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-t5325.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/palm27x.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/spdif.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c index bdffab33e160..c3521653cfd3 100644 --- a/sound/soc/ep93xx/ep93xx-ac97.c +++ b/sound/soc/ep93xx/ep93xx-ac97.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <sound/ac97_codec.h> | 21 | #include <sound/ac97_codec.h> |
22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
23 | 23 | ||
24 | #include <mach/dma.h> | 24 | #include <linux/platform_data/dma-ep93xx.h> |
25 | #include "ep93xx-pcm.h" | 25 | #include "ep93xx-pcm.h" |
26 | 26 | ||
27 | /* | 27 | /* |
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c index 8df8f6dc474f..ac4a7515e7be 100644 --- a/sound/soc/ep93xx/ep93xx-i2s.c +++ b/sound/soc/ep93xx/ep93xx-i2s.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <mach/ep93xx-regs.h> | 30 | #include <mach/ep93xx-regs.h> |
31 | #include <mach/dma.h> | 31 | #include <linux/platform_data/dma-ep93xx.h> |
32 | 32 | ||
33 | #include "ep93xx-pcm.h" | 33 | #include "ep93xx-pcm.h" |
34 | 34 | ||
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c index 4eea98b42bc8..665d9c94cc17 100644 --- a/sound/soc/ep93xx/ep93xx-pcm.c +++ b/sound/soc/ep93xx/ep93xx-pcm.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <sound/soc.h> | 25 | #include <sound/soc.h> |
26 | #include <sound/dmaengine_pcm.h> | 26 | #include <sound/dmaengine_pcm.h> |
27 | 27 | ||
28 | #include <mach/dma.h> | 28 | #include <linux/platform_data/dma-ep93xx.h> |
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <mach/ep93xx-regs.h> | 30 | #include <mach/ep93xx-regs.h> |
31 | 31 | ||
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 48f9d886f020..89a7755b6f56 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <sound/soc.h> | 30 | #include <sound/soc.h> |
31 | #include <sound/dmaengine_pcm.h> | 31 | #include <sound/dmaengine_pcm.h> |
32 | 32 | ||
33 | #include <mach/dma.h> | 33 | #include <linux/platform_data/dma-imx.h> |
34 | 34 | ||
35 | #include "imx-pcm.h" | 35 | #include "imx-pcm.h" |
36 | 36 | ||
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c index ee27ba3933bd..22c6130957ba 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/fiq.h> | 30 | #include <asm/fiq.h> |
31 | 31 | ||
32 | #include <mach/irqs.h> | 32 | #include <mach/irqs.h> |
33 | #include <mach/ssi.h> | 33 | #include <linux/platform_data/asoc-imx-ssi.h> |
34 | 34 | ||
35 | #include "imx-ssi.h" | 35 | #include "imx-ssi.h" |
36 | 36 | ||
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 81d7728cf67f..e6a17baca1ee 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <sound/pcm_params.h> | 47 | #include <sound/pcm_params.h> |
48 | #include <sound/soc.h> | 48 | #include <sound/soc.h> |
49 | 49 | ||
50 | #include <mach/ssi.h> | 50 | #include <linux/platform_data/asoc-imx-ssi.h> |
51 | #include <mach/hardware.h> | 51 | #include <mach/hardware.h> |
52 | 52 | ||
53 | #include "imx-ssi.h" | 53 | #include "imx-ssi.h" |
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h index 5744e86ca878..dc114bdedce5 100644 --- a/sound/soc/fsl/imx-ssi.h +++ b/sound/soc/fsl/imx-ssi.h | |||
@@ -186,7 +186,7 @@ | |||
186 | #define DRV_NAME "imx-ssi" | 186 | #define DRV_NAME "imx-ssi" |
187 | 187 | ||
188 | #include <linux/dmaengine.h> | 188 | #include <linux/dmaengine.h> |
189 | #include <mach/dma.h> | 189 | #include <linux/platform_data/dma-imx.h> |
190 | #include "imx-pcm.h" | 190 | #include "imx-pcm.h" |
191 | 191 | ||
192 | struct imx_ssi { | 192 | struct imx_ssi { |
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 7646dd7f30cb..542538d10ab7 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
22 | #include <sound/pcm_params.h> | 22 | #include <sound/pcm_params.h> |
23 | #include <sound/soc.h> | 23 | #include <sound/soc.h> |
24 | #include <plat/audio.h> | 24 | #include <linux/platform_data/asoc-kirkwood.h> |
25 | #include "kirkwood.h" | 25 | #include "kirkwood.h" |
26 | 26 | ||
27 | #define DRV_NAME "kirkwood-i2s" | 27 | #define DRV_NAME "kirkwood-i2s" |
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c index 80bd59c33be4..c28540aeea25 100644 --- a/sound/soc/kirkwood/kirkwood-openrd.c +++ b/sound/soc/kirkwood/kirkwood-openrd.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | #include <sound/soc.h> | 18 | #include <sound/soc.h> |
19 | #include <mach/kirkwood.h> | 19 | #include <mach/kirkwood.h> |
20 | #include <plat/audio.h> | 20 | #include <linux/platform_data/asoc-kirkwood.h> |
21 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
22 | #include "../codecs/cs42l51.h" | 22 | #include "../codecs/cs42l51.h" |
23 | 23 | ||
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c index f8983635f7ef..c67bbc574987 100644 --- a/sound/soc/kirkwood/kirkwood-t5325.c +++ b/sound/soc/kirkwood/kirkwood-t5325.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <sound/soc.h> | 17 | #include <sound/soc.h> |
18 | #include <mach/kirkwood.h> | 18 | #include <mach/kirkwood.h> |
19 | #include <plat/audio.h> | 19 | #include <linux/platform_data/asoc-kirkwood.h> |
20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
21 | #include "../codecs/alc5623.h" | 21 | #include "../codecs/alc5623.h" |
22 | 22 | ||
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index db24bc685bd3..aa3da91907c6 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
27 | #include <mach/audio.h> | 27 | #include <mach/audio.h> |
28 | #include <mach/palmasoc.h> | 28 | #include <linux/platform_data/asoc-palm27x.h> |
29 | 29 | ||
30 | #include "../codecs/wm9712.h" | 30 | #include "../codecs/wm9712.h" |
31 | #include "pxa2xx-ac97.h" | 31 | #include "pxa2xx-ac97.h" |
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 3d04c1fa6781..14fbcd30cae5 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include <mach/dma.h> | 22 | #include <mach/dma.h> |
23 | #include <plat/regs-ac97.h> | 23 | #include <plat/regs-ac97.h> |
24 | #include <plat/audio.h> | 24 | #include <linux/platform_data/asoc-s3c.h> |
25 | 25 | ||
26 | #include "dma.h" | 26 | #include "dma.h" |
27 | 27 | ||
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 6ac7b8281a02..40b00a13dcd1 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <sound/soc.h> | 20 | #include <sound/soc.h> |
21 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
22 | 22 | ||
23 | #include <plat/audio.h> | 23 | #include <linux/platform_data/asoc-s3c.h> |
24 | 24 | ||
25 | #include "dma.h" | 25 | #include "dma.h" |
26 | #include "idma.h" | 26 | #include "idma.h" |
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 89b064650f14..c86081992dfd 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
20 | #include <sound/pcm_params.h> | 20 | #include <sound/pcm_params.h> |
21 | 21 | ||
22 | #include <plat/audio.h> | 22 | #include <linux/platform_data/asoc-s3c.h> |
23 | #include <mach/dma.h> | 23 | #include <mach/dma.h> |
24 | 24 | ||
25 | #include "dma.h" | 25 | #include "dma.h" |
diff --git a/sound/soc/samsung/s3c24xx_simtec.c b/sound/soc/samsung/s3c24xx_simtec.c index 656d5afe4ca9..335a7d8a4a8d 100644 --- a/sound/soc/samsung/s3c24xx_simtec.c +++ b/sound/soc/samsung/s3c24xx_simtec.c | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | #include <sound/soc.h> | 14 | #include <sound/soc.h> |
15 | 15 | ||
16 | #include <plat/audio-simtec.h> | 16 | #include <linux/platform_data/asoc-s3c24xx_simtec.h> |
17 | 17 | ||
18 | #include "s3c24xx-i2s.h" | 18 | #include "s3c24xx-i2s.h" |
19 | #include "s3c24xx_simtec.h" | 19 | #include "s3c24xx_simtec.h" |
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index a5a56a120345..bc24c7af02b2 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <sound/soc.h> | 17 | #include <sound/soc.h> |
18 | #include <sound/pcm_params.h> | 18 | #include <sound/pcm_params.h> |
19 | 19 | ||
20 | #include <plat/audio.h> | 20 | #include <linux/platform_data/asoc-s3c.h> |
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | 22 | ||
23 | #include "dma.h" | 23 | #include "dma.h" |