From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 18 Jun 2013 19:13:53 +0000 (+0900)
Subject: Merge branch 'v3.11-next/cleanup-samsung' into for-next
X-Git-Tag: next-20130619~9^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e55612ae57113a50ed9e0d471abc241eb8219b0a;p=karo-tx-linux.git

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

e55612ae57113a50ed9e0d471abc241eb8219b0a
diff --cc arch/arm/mach-s3c24xx/Kconfig
index 7ef71198fc11,f8d1912f103e..6d9252e081ce
--- a/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.