Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

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

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index f5d9cd498a5fdaf567435e00fc9eb43101cd438f..bbd138be6a70779663bd4aa1798f629e4b81e007 100644 (file)
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -71,19 +71,27 @@ config ARCH_S3C2440
          Say Y here if you are using the SMDK2440.
 
 config SMDK2440_CPU2440
-       bool "SMDK2440 with S3C2440 cpu module"
+       bool "SMDK2440 with S3C2440 CPU module"
        depends on ARCH_S3C2440
        default y if ARCH_S3C2440
        select CPU_S3C2440
 
 config SMDK2440_CPU2442
-       bool "SMDM2440 with S3C2442 cpu module"
+       bool "SMDM2440 with S3C2442 CPU module"
        depends on ARCH_S3C2440
        select CPU_S3C2442
 
+config MACH_S3C2413
+       bool
+       help
+         Internal node for S3C2413 verison of SMDK2413, so that
+         machine_is_s3c2413() will work when MACH_SMDK2413 is
+         selected
+
 config MACH_SMDK2413
        bool "SMDK2413"
        select CPU_S3C2412
+       select MACH_S3C2413
        select MACH_SMDK
        help
          Say Y here if you are using an SMDK2413