summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2013-10-06 09:06:27 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-10-06 09:06:27 +0900
commit6e2d9e935240b6276eaf913c20bb989fd0ed70ee (patch)
treecd83e126a704cf6561c072db4449b7c40416e25b /arch/arm
parent7472a2f21b6f73ea95841afbd8686e2515ab696b (diff)
ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX
CONFIG_PLAT_S3C64XX has been kept in place way too long since it was marked as temporary in commit 110d85a ARM: S3C64XX: Eliminate plat-s3c64xx After fixing all users of it in previous patches, this patch finally kills this temporary Kconfig entry. 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/Kconfig11
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4a329c7277b1..4270cd7e7b67 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -737,11 +737,13 @@ config ARCH_S3C64XX
select NEED_MACH_GPIO_H
select NO_IOPORT
select PLAT_SAMSUNG
+ select PM_GENERIC_DOMAINS
select S3C_DEV_NAND
select S3C_GPIO_TRACK
select SAMSUNG_ATAGS
select SAMSUNG_CLKSRC
select SAMSUNG_GPIOLIB_4BIT
+ select SAMSUNG_WAKEMASK
select SAMSUNG_WDT_RESET
select USB_ARCH_HAS_OHCI
help
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index afb511395800..a2d5bb33647d 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -5,17 +5,6 @@
if ARCH_S3C64XX
-# temporary until we can eliminate all drivers using it.
-config PLAT_S3C64XX
- bool
- depends on ARCH_S3C64XX
- default y
- select PM_GENERIC_DOMAINS
- select SAMSUNG_WAKEMASK
- help
- Base platform code for any Samsung S3C64XX device
-
-
# Configuration options for the S3C6410 CPU
config CPU_S3C6400