Merge tag 'v3.15-rc1' into perf/urgent

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c64xx / Kconfig

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 64f04e6f9c317e3b79ceb8a530d21057c0be84f0..3136d86b0d6eef17c219db9f546b0c4de47f1ebc 100644 (file)
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -86,8 +86,7 @@ config MACH_SMDK6400
        bool "SMDK6400"
        select CPU_S3C6400
        select S3C64XX_SETUP_SDHCI
-       select S3C_DEV_HSMMC
-       select S3C_DEV_NAND
+       select S3C_DEV_HSMMC1
        help
          Machine support for the Samsung SMDK6400