Merge tag 'ux500-arm-soc-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / plat-samsung / Kconfig

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 53b2d59ca252f6d52683a9d8c9d433f36a5328ac..f8ed2de0a6783cfe498577b3cab7de531b192761 100644 (file)
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -13,10 +13,6 @@ config PLAT_SAMSUNG
        help
          Base platform code for all Samsung SoC based systems
 
-config PLAT_SAMSUNG_SINGLE
-       def_bool PLAT_SAMSUNG && !ARCH_MULTIPLATFORM
-       
-
 config PLAT_S5P
        bool
        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
@@ -27,7 +23,7 @@ config PLAT_S5P
        select GIC_NON_BANKED if ARCH_EXYNOS4
        select NO_IOPORT
        select PLAT_SAMSUNG
-       select S3C_GPIO_TRACK if PLAT_SAMSUNG_SINGLE
+       select S3C_GPIO_TRACK
        select S5P_GPIO_DRVSTR
        select SAMSUNG_CLKSRC if !COMMON_CLK
        select SAMSUNG_GPIOLIB_4BIT
@@ -41,14 +37,6 @@ if PLAT_SAMSUNG
 
 comment "Boot options"
 
-config S3C_BOOT_WATCHDOG
-       bool "S3C Initialisation watchdog"
-       depends on S3C2410_WATCHDOG
-       help
-         Say y to enable the watchdog during the kernel decompression
-         stage. If the kernel fails to uncompress, then the watchdog
-         will trigger a reset and the system should restart.
-
 config S3C_BOOT_ERROR_RESET
        bool "S3C Reboot on decompression error"
        help
@@ -129,12 +117,6 @@ config SAMSUNG_GPIOLIB_4BIT
          configuration. GPIOlib shall be compiled only for S3C64XX and S5P
          series of processors.
 
-config S3C_GPIO_CFG_S3C64XX
-       bool
-       help
-         Internal configuration to enable S3C64XX style GPIO configuration
-         functions.
-
 config S5P_GPIO_DRVSTR
        bool
        help
@@ -182,7 +164,6 @@ config S5P_DEV_UART
 
 config S3C_ADC
        bool "ADC common driver support"
-       depends on PLAT_SAMSUNG_SINGLE
        help
          Core support for the ADC block found in the Samsung SoC systems
          for drivers such as the touchscreen and hwmon to use to share