diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/samsung/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/samsung/smdk_wm8580.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index a3fdfb631469..4b96b18a1bb7 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config SND_SOC_SAMSUNG | 1 | config SND_SOC_SAMSUNG |
2 | tristate "ASoC support for Samsung" | 2 | tristate "ASoC support for Samsung" |
3 | depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_EXYNOS4 | 3 | depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4 |
4 | select S3C64XX_DMA if ARCH_S3C64XX | 4 | select S3C64XX_DMA if ARCH_S3C64XX |
5 | select S3C2410_DMA if ARCH_S3C2410 | 5 | select S3C2410_DMA if ARCH_S3C2410 |
6 | help | 6 | help |
@@ -55,7 +55,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750 | |||
55 | 55 | ||
56 | config SND_SOC_SAMSUNG_SMDK_WM8580 | 56 | config SND_SOC_SAMSUNG_SMDK_WM8580 |
57 | tristate "SoC I2S Audio support for WM8580 on SMDK" | 57 | tristate "SoC I2S Audio support for WM8580 on SMDK" |
58 | depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110) | 58 | depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110) |
59 | select SND_SOC_WM8580 | 59 | select SND_SOC_WM8580 |
60 | select SND_SAMSUNG_I2S | 60 | select SND_SAMSUNG_I2S |
61 | help | 61 | help |
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c index 8aacf23d6f3a..3d26f6607aa4 100644 --- a/sound/soc/samsung/smdk_wm8580.c +++ b/sound/soc/samsung/smdk_wm8580.c | |||
@@ -249,7 +249,7 @@ static int __init smdk_audio_init(void) | |||
249 | int ret; | 249 | int ret; |
250 | char *str; | 250 | char *str; |
251 | 251 | ||
252 | if (machine_is_smdkc100() || machine_is_smdk6442() | 252 | if (machine_is_smdkc100() |
253 | || machine_is_smdkv210() || machine_is_smdkc110()) { | 253 | || machine_is_smdkv210() || machine_is_smdkc110()) { |
254 | smdk.num_links = 3; | 254 | smdk.num_links = 3; |
255 | /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ | 255 | /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ |