Merge branch 'v3.11-next/cleanup-samsung' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c24xx/Kconfig
index 7ef71198fc1121f049a5f1fd6362b18cb1c60b2f,f8d1912f103ec0ce3cd755b2a443a1ef0f210417..6d9252e081ce39af2b2e94452b36a6402c429197
--- 1/arch/arm/mach-s3c24xx/Kconfig
--- 2/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@@ -28,9 -28,10 +28,10 @@@ config CPU_S3C241
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2410
        select S3C2410_CLOCK
 -      select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
 +      select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
        select S3C2410_PM if PM
        select SAMSUNG_HRT
+       select SAMSUNG_WDT_RESET
        help
          Support for S3C2410 and S3C2410A family from the S3C24XX line
          of Samsung Mobile CPUs.