diff options
-rw-r--r-- | sound/soc/s3c24xx/regs-i2s-v2.h (renamed from arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h) | 0 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 3 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 3 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h b/sound/soc/s3c24xx/regs-i2s-v2.h index abf2fbc2eb2f..abf2fbc2eb2f 100644 --- a/arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h +++ b/sound/soc/s3c24xx/regs-i2s-v2.h | |||
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 865f93143bf1..cb3652ed057d 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c | |||
@@ -24,10 +24,9 @@ | |||
24 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
25 | #include <sound/soc.h> | 25 | #include <sound/soc.h> |
26 | 26 | ||
27 | #include <plat/regs-s3c2412-iis.h> | ||
28 | |||
29 | #include <mach/dma.h> | 27 | #include <mach/dma.h> |
30 | 28 | ||
29 | #include "regs-i2s-v2.h" | ||
31 | #include "s3c-i2s-v2.h" | 30 | #include "s3c-i2s-v2.h" |
32 | #include "s3c-dma.h" | 31 | #include "s3c-dma.h" |
33 | 32 | ||
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index f3148f98b419..7134465693e3 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -32,12 +32,11 @@ | |||
32 | #include <sound/soc.h> | 32 | #include <sound/soc.h> |
33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
34 | 34 | ||
35 | #include <plat/regs-s3c2412-iis.h> | ||
36 | |||
37 | #include <mach/regs-gpio.h> | 35 | #include <mach/regs-gpio.h> |
38 | #include <mach/dma.h> | 36 | #include <mach/dma.h> |
39 | 37 | ||
40 | #include "s3c-dma.h" | 38 | #include "s3c-dma.h" |
39 | #include "regs-i2s-v2.h" | ||
41 | #include "s3c2412-i2s.h" | 40 | #include "s3c2412-i2s.h" |
42 | 41 | ||
43 | #define S3C2412_I2S_DEBUG 0 | 42 | #define S3C2412_I2S_DEBUG 0 |
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index ab1fa159d3ae..b7e951fe30a6 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
20 | 20 | ||
21 | #include <plat/regs-s3c2412-iis.h> | ||
22 | #include <mach/gpio-bank-d.h> | 21 | #include <mach/gpio-bank-d.h> |
23 | #include <mach/gpio-bank-e.h> | 22 | #include <mach/gpio-bank-e.h> |
24 | #include <plat/gpio-cfg.h> | 23 | #include <plat/gpio-cfg.h> |
@@ -27,6 +26,7 @@ | |||
27 | #include <mach/dma.h> | 26 | #include <mach/dma.h> |
28 | 27 | ||
29 | #include "s3c-dma.h" | 28 | #include "s3c-dma.h" |
29 | #include "regs-i2s-v2.h" | ||
30 | #include "s3c64xx-i2s.h" | 30 | #include "s3c64xx-i2s.h" |
31 | 31 | ||
32 | /* The value should be set to maximum of the total number | 32 | /* The value should be set to maximum of the total number |