Merge branch 'next-samsung' into for-next

[pandora-kernel.git] / arch / arm / mach-s5p6440 / Kconfig

diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig
index 153f8c9..6a4af7f 100644 (file)
--- a/arch/arm/mach-s5p6440/Kconfig
+++ b/arch/arm/mach-s5p6440/Kconfig
@@ -21,13 +21,11 @@ config S5P6440_SETUP_I2C1
 config MACH_SMDK6440
        bool "SMDK6440"
        select CPU_S5P6440
-       select SAMSUNG_DEV_TS
-       select SAMSUNG_DEV_ADC
-       select S3C_DEV_RTC
        select S3C_DEV_I2C1
+       select S3C_DEV_RTC
        select S3C_DEV_WDT
-       select HAVE_S3C_RTC
-       select HAVE_S3C2410_WATCHDOG
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
        select S5P6440_SETUP_I2C1
        help
          Machine support for the Samsung SMDK6440