summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-03-09 16:56:34 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-03-09 16:56:34 +0900
commit8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch)
tree3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /arch/arm/mach-exynos/Kconfig
parentb85b64cc22122adca695e0f8c340cc677ad92e8c (diff)
parent6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff)
downloadlinux-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.gz
linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.bz2
linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.zip
Merge branch 'next/mct-exynos' into next/clk-exynos
Conflicts: arch/arm/mach-exynos/mach-exynos4-dt.c
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r--arch/arm/mach-exynos/Kconfig8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index bc15b9ee8174..ef3b69a6277c 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -80,12 +80,6 @@ config SOC_EXYNOS5440
help
Enable EXYNOS5440 SoC support
-config EXYNOS4_MCT
- bool
- default y
- help
- Use MCT (Multi Core Timer) as kernel timers
-
config EXYNOS_DEV_DMA
bool
help
@@ -407,6 +401,7 @@ config MACH_EXYNOS4_DT
bool "Samsung Exynos4 Machine using device tree"
depends on ARCH_EXYNOS4
select ARM_AMBA
+ select CLKSRC_OF
select CPU_EXYNOS4210
select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
select PINCTRL
@@ -424,6 +419,7 @@ config MACH_EXYNOS5_DT
default y
depends on ARCH_EXYNOS5
select ARM_AMBA
+ select CLKSRC_OF
select USE_OF
help
Machine support for Samsung EXYNOS5 machine with device tree enabled.