diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 09:16:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 09:16:17 +1100 |
| commit | fe5dd46cc2d31443b6daafbc83f603239e6a89f0 (patch) | |
| tree | db9bfa978953a2e5137e618313604de597cd6ed2 /sound | |
| parent | f6616ef480322fb89e07e878c219d143377b3e48 (diff) | |
| parent | c1b35c610b8929a7ae01e200194c8165fccd6a58 (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-tegra/Kconfig
drivers/clk/clk-nomadik.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/samsung/s3c-i2s-v2.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 2eea1840315d..37459dfd168d 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -2,7 +2,7 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on PLAT_SAMSUNG select S3C64XX_DMA if ARCH_S3C64XX - select S3C2410_DMA if ARCH_S3C24XX + select S3C24XX_DMA if ARCH_S3C24XX help Say Y or M if you want to add support for codecs attached to the Samsung SoCs' Audio interfaces. You will also need to diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index e5e81b111001..fefc56100349 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -31,11 +31,7 @@ #undef S3C_IIS_V2_SUPPORTED #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \ - || defined(CONFIG_CPU_S5PV210) -#define S3C_IIS_V2_SUPPORTED -#endif - -#ifdef CONFIG_PLAT_S3C64XX + || defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_CPU_S5PV210) #define S3C_IIS_V2_SUPPORTED #endif |