Merge branch 'v3.13-next/samsung' into for-next

Conflicts:
	arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e639a301444db56712bd86fa6e161be273520eac..4a2e76fc1f606299c0f449363bbfe013c005b029 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -728,7 +728,7 @@ config ARCH_S3C64XX
        select CLKDEV_LOOKUP
        select CLKSRC_SAMSUNG_PWM
        select COMMON_CLK
-       select CPU_V6
+       select CPU_V6K
        select GENERIC_CLOCKEVENTS
        select GPIO_SAMSUNG
        select HAVE_CLK