diff options
-rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2412.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2440.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/h1940_uda1380.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/regs-ac97.h (renamed from arch/arm/plat-samsung/include/plat/regs-ac97.h) | 0 | ||||
-rw-r--r-- | sound/soc/samsung/regs-iis.h (renamed from arch/arm/plat-samsung/include/plat/regs-iis.h) | 0 | ||||
-rw-r--r-- | sound/soc/samsung/rx1950_uda1380.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_uda134x.c | 2 |
12 files changed, 6 insertions, 14 deletions
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2410.c b/arch/arm/mach-s3c24xx/dma-s3c2410.c index 25d085adc93c..a4a13c99083b 100644 --- a/arch/arm/mach-s3c24xx/dma-s3c2410.c +++ b/arch/arm/mach-s3c24xx/dma-s3c2410.c | |||
@@ -25,11 +25,9 @@ | |||
25 | 25 | ||
26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
28 | #include <plat/regs-ac97.h> | ||
29 | #include <plat/regs-dma.h> | 28 | #include <plat/regs-dma.h> |
30 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
31 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
32 | #include <plat/regs-iis.h> | ||
33 | #include <plat/regs-spi.h> | 31 | #include <plat/regs-spi.h> |
34 | 32 | ||
35 | static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { | 33 | static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { |
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2412.c b/arch/arm/mach-s3c24xx/dma-s3c2412.c index d2408ba372cb..6eaa7a4991f8 100644 --- a/arch/arm/mach-s3c24xx/dma-s3c2412.c +++ b/arch/arm/mach-s3c24xx/dma-s3c2412.c | |||
@@ -25,11 +25,9 @@ | |||
25 | 25 | ||
26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
28 | #include <plat/regs-ac97.h> | ||
29 | #include <plat/regs-dma.h> | 28 | #include <plat/regs-dma.h> |
30 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
31 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
32 | #include <plat/regs-iis.h> | ||
33 | #include <plat/regs-spi.h> | 31 | #include <plat/regs-spi.h> |
34 | 32 | ||
35 | #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } | 33 | #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } |
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2440.c b/arch/arm/mach-s3c24xx/dma-s3c2440.c index 0b86e74d104f..477d4501967f 100644 --- a/arch/arm/mach-s3c24xx/dma-s3c2440.c +++ b/arch/arm/mach-s3c24xx/dma-s3c2440.c | |||
@@ -25,11 +25,9 @@ | |||
25 | 25 | ||
26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
28 | #include <plat/regs-ac97.h> | ||
29 | #include <plat/regs-dma.h> | 28 | #include <plat/regs-dma.h> |
30 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
31 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
32 | #include <plat/regs-iis.h> | ||
33 | #include <plat/regs-spi.h> | 31 | #include <plat/regs-spi.h> |
34 | 32 | ||
35 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { | 33 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { |
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2443.c b/arch/arm/mach-s3c24xx/dma-s3c2443.c index 05536254a3f8..80a8d56e2559 100644 --- a/arch/arm/mach-s3c24xx/dma-s3c2443.c +++ b/arch/arm/mach-s3c24xx/dma-s3c2443.c | |||
@@ -25,11 +25,9 @@ | |||
25 | 25 | ||
26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
28 | #include <plat/regs-ac97.h> | ||
29 | #include <plat/regs-dma.h> | 28 | #include <plat/regs-dma.h> |
30 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
31 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
32 | #include <plat/regs-iis.h> | ||
33 | #include <plat/regs-spi.h> | 31 | #include <plat/regs-spi.h> |
34 | 32 | ||
35 | #define MAP(x) { \ | 33 | #define MAP(x) { \ |
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 0df3c5644cfa..c76abdf6173f 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <sound/soc.h> | 20 | #include <sound/soc.h> |
21 | 21 | ||
22 | #include <mach/dma.h> | 22 | #include <mach/dma.h> |
23 | #include <plat/regs-ac97.h> | 23 | #include "regs-ac97.h" |
24 | #include <linux/platform_data/asoc-s3c.h> | 24 | #include <linux/platform_data/asoc-s3c.h> |
25 | 25 | ||
26 | #include "dma.h" | 26 | #include "dma.h" |
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 15a3817aa5c8..fa91376e323d 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <sound/soc.h> | 20 | #include <sound/soc.h> |
21 | #include <sound/jack.h> | 21 | #include <sound/jack.h> |
22 | 22 | ||
23 | #include <plat/regs-iis.h> | 23 | #include "regs-iis.h" |
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | 25 | ||
26 | #include "s3c24xx-i2s.h" | 26 | #include "s3c24xx-i2s.h" |
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index a301d8cfaa34..ccc601d5a3fb 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <sound/soc.h> | 21 | #include <sound/soc.h> |
22 | 22 | ||
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | #include <plat/regs-iis.h> | 24 | #include "regs-iis.h" |
25 | #include <mach/gta02.h> | 25 | #include <mach/gta02.h> |
26 | 26 | ||
27 | #include "../codecs/wm8753.h" | 27 | #include "../codecs/wm8753.h" |
diff --git a/arch/arm/plat-samsung/include/plat/regs-ac97.h b/sound/soc/samsung/regs-ac97.h index c3878f7acb83..c3878f7acb83 100644 --- a/arch/arm/plat-samsung/include/plat/regs-ac97.h +++ b/sound/soc/samsung/regs-ac97.h | |||
diff --git a/arch/arm/plat-samsung/include/plat/regs-iis.h b/sound/soc/samsung/regs-iis.h index a18d35e7a735..a18d35e7a735 100644 --- a/arch/arm/plat-samsung/include/plat/regs-iis.h +++ b/sound/soc/samsung/regs-iis.h | |||
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c index a5826ea9cad6..704460a37005 100644 --- a/sound/soc/samsung/rx1950_uda1380.c +++ b/sound/soc/samsung/rx1950_uda1380.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <sound/soc.h> | 24 | #include <sound/soc.h> |
25 | #include <sound/jack.h> | 25 | #include <sound/jack.h> |
26 | 26 | ||
27 | #include <plat/regs-iis.h> | 27 | #include "regs-iis.h" |
28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
29 | 29 | ||
30 | #include "s3c24xx-i2s.h" | 30 | #include "s3c24xx-i2s.h" |
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 13f6dd1ceb00..a7b17c15236f 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
25 | 25 | ||
26 | #include <mach/dma.h> | 26 | #include <mach/dma.h> |
27 | #include <plat/regs-iis.h> | 27 | #include "regs-iis.h" |
28 | 28 | ||
29 | #include "dma.h" | 29 | #include "dma.h" |
30 | #include "s3c24xx-i2s.h" | 30 | #include "s3c24xx-i2s.h" |
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index 333e1b7f06c7..1b7b52b0af97 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <sound/soc.h> | 18 | #include <sound/soc.h> |
19 | #include <sound/s3c24xx_uda134x.h> | 19 | #include <sound/s3c24xx_uda134x.h> |
20 | 20 | ||
21 | #include <plat/regs-iis.h> | 21 | #include "regs-iis.h" |
22 | 22 | ||
23 | #include "s3c24xx-i2s.h" | 23 | #include "s3c24xx-i2s.h" |
24 | 24 | ||