summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2013-10-06 08:58:40 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-10-06 09:01:48 +0900
commitd2193ce2ce2ca3cfc33c479a14ff04c269c3cca9 (patch)
treea53ac6228f4faa27fc179f4646d34219c6c91e35 /arch/arm
parent4a10c2ac2f368583138b774ca41fac4207911983 (diff)
downloadtalos-obmc-linux-d2193ce2ce2ca3cfc33c479a14ff04c269c3cca9.tar.gz
talos-obmc-linux-d2193ce2ce2ca3cfc33c479a14ff04c269c3cca9.zip
ARM: S3C64XX: Move if ARCH_S3C64XX statement into mach-s3c64xx
All other platforms have this condition checked inside their own Kconfig files, so for consistency this patch makes it this way for mach-s3c64xx as well. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3f7714d8d2d2..4a329c7277b1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1009,9 +1009,7 @@ source "arch/arm/mach-sti/Kconfig"
source "arch/arm/mach-s3c24xx/Kconfig"
-if ARCH_S3C64XX
source "arch/arm/mach-s3c64xx/Kconfig"
-endif
source "arch/arm/mach-s5p64x0/Kconfig"
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 041da5172423..afb511395800 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -3,6 +3,8 @@
#
# Licensed under GPLv2
+if ARCH_S3C64XX
+
# temporary until we can eliminate all drivers using it.
config PLAT_S3C64XX
bool
@@ -306,3 +308,5 @@ config MACH_WLF_CRAGG_6410
select SAMSUNG_GPIO_EXTRA128
help
Machine support for the Wolfson Cragganmore S3C6410 variant.
+
+endif
OpenPOWER on IntegriCloud