aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 11:32:02 -0700
committerOlof Johansson <olof@lixom.net>2013-04-26 11:35:51 -0700
commit4923ee444a39c8b75027ed01a7812e940194dbec (patch)
tree660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/plat-samsung/Kconfig
parentARM: exynos: enable multiplatform support (diff)
downloadlinux-dev-4923ee444a39c8b75027ed01a7812e940194dbec.tar.xz
linux-dev-4923ee444a39c8b75027ed01a7812e940194dbec.zip
Revert "ARM: exynos: enable multiplatform support"
This reverts commit bd51de53e1be9896d815bbea30560262216d4616. Turns out that multiplatform breaks some uses cases, such as when you have an existing defconfig, since it adds the new EXYNOS_SINGLE config option as a dependecy. As a result, nearly all exynos config options will be disabled by default. Reverting instead of rebasing since this branch is pulled in as a dependency elsewhere. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
-rw-r--r--arch/arm/plat-samsung/Kconfig7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 8aae6816ebc2..a9d52167e16e 100644
--- 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
select SAMSUNG_GPIOLIB_4BIT
@@ -182,7 +178,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