diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-11 03:05:46 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-11 03:05:46 +0100 |
| commit | f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58 (patch) | |
| tree | 852f617cf2d5329f6c0511190806516e026a56d8 /sound | |
| parent | Linux 2.6.38-rc8 (diff) | |
| parent | ARM: EXYNOS4: Implement kernel timers using MCT (diff) | |
| download | linux-f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58.tar.xz linux-f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58.zip | |
Merge branch 'next-exynos4' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index a6a6b5fa2f2f..d6713d5a90e7 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -1,6 +1,6 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" - depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310 + depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_EXYNOS4 select S3C64XX_DMA if ARCH_S3C64XX select S3C2410_DMA if ARCH_S3C2410 help |