summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 23:33:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 23:33:37 +0200
commiteb1574270a6de8fb8d31ffc3b021e30df0afcda3 (patch)
treed154ba369f222f5108ed1a2462d815d7faadc2e5 /arch/arm/mach-s3c24xx/Kconfig
parentmemory: emif: add debugfs entries for emif (diff)
parentLinux 3.4-rc5 (diff)
downloadlinux-eb1574270a6de8fb8d31ffc3b021e30df0afcda3.tar.xz
linux-eb1574270a6de8fb8d31ffc3b021e30df0afcda3.zip
Merge 3.4-rc5 into driver-core-next
This was done to resolve a merge issue with the init/main.c file. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/Kconfig')
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 0f3a327ebcaa..b34287ab5afd 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -111,10 +111,6 @@ config S3C24XX_SETUP_TS
help
Compile in platform device definition for Samsung TouchScreen.
-# cpu-specific sections
-
-if CPU_S3C2410
-
config S3C2410_DMA
bool
depends on S3C24XX_DMA && (CPU_S3C2410 || CPU_S3C2442)
@@ -127,6 +123,10 @@ config S3C2410_PM
help
Power Management code common to S3C2410 and better
+# cpu-specific sections
+
+if CPU_S3C2410
+
config S3C24XX_SIMTEC_NOR
bool
help