1 files changed, 11 insertions, 9 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 166efa2a19cd..eed07eac3a5f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -715,7 +715,8 @@ config ARCH_S5P64X0
         select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select ARCH_USES_GETTIMEOFFSET
+        select GENERIC_CLOCKEVENTS
+        select HAVE_SCHED_CLOCK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C_RTC if RTC_CLASS
         help
@@ -753,15 +754,16 @@ config ARCH_S5PV210
         select HAVE_CLK
         select ARM_L1_CACHE_SHIFT_6
         select ARCH_HAS_CPUFREQ
-        select ARCH_USES_GETTIMEOFFSET
+        select GENERIC_CLOCKEVENTS
+        select HAVE_SCHED_CLOCK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C_RTC if RTC_CLASS
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         help
           Samsung S5PV210/S5PC110 series based systems
 
-config ARCH_S5PV310
-        bool "Samsung S5PV310/S5PC210"
+config ARCH_EXYNOS4
+        bool "Samsung EXYNOS4"
         select CPU_V7
         select ARCH_SPARSEMEM_ENABLE
         select GENERIC_GPIO
@@ -772,7 +774,7 @@ config ARCH_S5PV310
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         help
-          Samsung S5PV310 series based systems
+          Samsung EXYNOS4 series based systems
 
 config ARCH_SHARK
         bool "Shark"
@@ -991,7 +993,7 @@ source "arch/arm/mach-s5pc100/Kconfig"
 
 source "arch/arm/mach-s5pv210/Kconfig"
 
-source "arch/arm/mach-s5pv310/Kconfig"
+source "arch/arm/mach-exynos4/Kconfig"
 
 source "arch/arm/mach-shmobile/Kconfig"
 
@@ -1278,7 +1280,7 @@ config SMP
         depends on GENERIC_CLOCKEVENTS
         depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
                  MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-                 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
+                 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
                  ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
         select USE_GENERIC_SMP_HELPERS
         select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
@@ -1366,7 +1368,7 @@ config LOCAL_TIMERS
         bool "Use local timer interrupts"
         depends on SMP
         default y
-        select HAVE_ARM_TWD if !ARCH_MSM_SCORPIONMP
+        select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)
         help
           Enable support for local timers on SMP platforms, rather then the
           legacy IPI broadcast method.  Local timers allows the system
@@ -1378,7 +1380,7 @@ source kernel/Kconfig.preempt
 config HZ
         int
         default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \
-                ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310
+                ARCH_S5P6442 || ARCH_S5PV210 || ARCH_EXYNOS4
         default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
         default AT91_TIMER_HZ if ARCH_AT91
         default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE