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, 15 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index f5a59727949..071e8a1e076 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -57,11 +57,21 @@ config S3C64XX_SETUP_I2C1
         help
           Common setup code for i2c bus 1.
 
+config S3C64XX_SETUP_IDE
+        bool
+        help
+          Common setup code for S3C64XX IDE.
+
 config S3C64XX_SETUP_FB_24BPP
         bool
         help
           Common setup code for S3C64XX with an 24bpp RGB display helper.
 
+config S3C64XX_SETUP_KEYPAD
+        bool
+        help
+          Common setup code for S3C64XX KEYPAD GPIO configurations
+
 config S3C64XX_SETUP_SDHCI_GPIO
         bool
         help
@@ -95,15 +105,20 @@ config MACH_SMDK6410
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_I2C1
+        select SAMSUNG_DEV_IDE
         select S3C_DEV_FB
+        select S3C_DEV_RTC
         select SAMSUNG_DEV_TS
         select S3C_DEV_USB_HOST
         select S3C_DEV_USB_HSOTG
         select S3C_DEV_WDT
+        select SAMSUNG_DEV_KEYPAD
         select HAVE_S3C2410_WATCHDOG
         select S3C64XX_SETUP_SDHCI
         select S3C64XX_SETUP_I2C1
+        select S3C64XX_SETUP_IDE
         select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_KEYPAD
         help
           Machine support for the Samsung SMDK6410