Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

1 files changed, 8 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c1795c952bfe..476074fdb402 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -682,6 +682,7 @@ config ARCH_S3C2410
         select GENERIC_GPIO
         select ARCH_HAS_CPUFREQ
         select HAVE_CLK
+        select CLKDEV_LOOKUP
         select ARCH_USES_GETTIMEOFFSET
         select HAVE_S3C2410_I2C if I2C
         help
@@ -699,6 +700,7 @@ config ARCH_S3C64XX
         select CPU_V6
         select ARM_VIC
         select HAVE_CLK
+        select CLKDEV_LOOKUP
         select NO_IOPORT
         select ARCH_USES_GETTIMEOFFSET
         select ARCH_HAS_CPUFREQ
@@ -723,6 +725,8 @@ config ARCH_S5P64X0
         select CPU_V6
         select GENERIC_GPIO
         select HAVE_CLK
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select GENERIC_CLOCKEVENTS
         select HAVE_SCHED_CLOCK
@@ -736,6 +740,7 @@ config ARCH_S5PC100
         bool "Samsung S5PC100"
         select GENERIC_GPIO
         select HAVE_CLK
+        select CLKDEV_LOOKUP
         select CPU_V7
         select ARM_L1_CACHE_SHIFT_6
         select ARCH_USES_GETTIMEOFFSET
@@ -751,6 +756,8 @@ config ARCH_S5PV210
         select ARCH_SPARSEMEM_ENABLE
         select GENERIC_GPIO
         select HAVE_CLK
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select ARM_L1_CACHE_SHIFT_6
         select ARCH_HAS_CPUFREQ
         select GENERIC_CLOCKEVENTS
@@ -767,6 +774,7 @@ config ARCH_EXYNOS4
         select ARCH_SPARSEMEM_ENABLE
         select GENERIC_GPIO
         select HAVE_CLK
+        select CLKDEV_LOOKUP
         select ARCH_HAS_CPUFREQ
         select GENERIC_CLOCKEVENTS
         select HAVE_S3C_RTC if RTC_CLASS