Merge branch 'next-samsung' into for-next

Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h

1 files changed, 5 insertions, 7 deletions

diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index 25ca7c686e77..ab038d090764 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -49,24 +49,22 @@ config S5PC100_SETUP_SDHCI_GPIO
 config MACH_SMDKC100
         bool "SMDKC100"
         select CPU_S5PC100
-        select SAMSUNG_DEV_ADC
         select S3C_DEV_FB
-        select S3C_DEV_I2C1
-        select SAMSUNG_DEV_IDE
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
-        select SAMSUNG_DEV_KEYPAD
+        select S3C_DEV_I2C1
         select S3C_DEV_RTC
-        select SAMSUNG_DEV_TS
         select S3C_DEV_WDT
-        select HAVE_S3C2410_WATCHDOG
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_IDE
+        select SAMSUNG_DEV_KEYPAD
+        select SAMSUNG_DEV_TS
         select S5PC100_SETUP_FB_24BPP
         select S5PC100_SETUP_I2C1
         select S5PC100_SETUP_IDE
         select S5PC100_SETUP_KEYPAD
         select S5PC100_SETUP_SDHCI
-        select HAVE_S3C_RTC
         help
           Machine support for the Samsung SMDKC100