Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

[pandora-kernel.git] / arch / arm / plat-s5p / Kconfig

diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index e7c31e7..92bd756 100644 (file)
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -7,13 +7,13 @@
 
 config PLAT_S5P
        bool
-       depends on ARCH_S5P6440
+       depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210)
        default y
-       select PLAT_S3C
        select ARM_VIC
        select NO_IOPORT
        select ARCH_REQUIRE_GPIOLIB
        select S3C_GPIO_TRACK
+       select S5P_GPIO_DRVSTR
        select SAMSUNG_GPIOLIB_4BIT
        select S3C_GPIO_CFG_S3C64XX
        select S3C_GPIO_PULL_UPDOWN
@@ -24,19 +24,3 @@ config PLAT_S5P
        select SAMSUNG_IRQ_UART
        help
          Base platform code for Samsung's S5P series SoC.
-
-if (PLAT_S5P && ARCH_S5P6440)
-
-# Configuration options shared by all S5P64XX implementations
-
-config CPU_S5P6440_INIT
-       bool
-       help
-        Initialisation code for the S5P6440.
-
-config CPU_S5P6440_CLOCK
-       bool
-       help
-         Clock support code for the S5P6440.
-
-endif