diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:01:26 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:01:26 +0900 |
commit | ab5a4e6381d27a6554e6833383e536773e3a6ec1 (patch) | |
tree | 88cfa18c33229cea756c2308607c26c1f19e9203 /arch/arm/plat-samsung/Kconfig | |
parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
parent | 5ddfa8428b9f21453b1160846143e0b50d51b27c (diff) |
Merge branch 'next/devel-samsung' into next/devel-samsung-2
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index a0ffc77da80..77e65b483f9 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -291,7 +291,7 @@ config S3C_DMA config SAMSUNG_DMADEV bool select DMADEVICES - select PL330_DMA if (CPU_EXYNOS4210 || CPU_S5PV210 || CPU_S5PC100 || \ + select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \ CPU_S5P6450 || CPU_S5P6440) select ARM_AMBA help |