aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 14:32:02 -0400
committerOlof Johansson <olof@lixom.net>2013-04-26 14:35:51 -0400
commit4923ee444a39c8b75027ed01a7812e940194dbec (patch)
tree660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/Kconfig
parentbd51de53e1be9896d815bbea30560262216d4616 (diff)
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/Kconfig')
-rw-r--r--arch/arm/Kconfig9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b375a94fe292..13b739469c51 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -853,11 +853,18 @@ config ARCH_S5PV210
853 help 853 help
854 Samsung S5PV210/S5PC110 series based systems 854 Samsung S5PV210/S5PC110 series based systems
855 855
856config ARCH_EXYNOS_SINGLE 856config ARCH_EXYNOS
857 bool "Samsung EXYNOS" 857 bool "Samsung EXYNOS"
858 select ARCH_HAS_CPUFREQ
858 select ARCH_HAS_HOLES_MEMORYMODEL 859 select ARCH_HAS_HOLES_MEMORYMODEL
859 select ARCH_SPARSEMEM_ENABLE 860 select ARCH_SPARSEMEM_ENABLE
861 select CLKDEV_LOOKUP
862 select CPU_V7
863 select GENERIC_CLOCKEVENTS
864 select HAVE_CLK
865 select HAVE_S3C2410_I2C if I2C
860 select HAVE_S3C2410_WATCHDOG if WATCHDOG 866 select HAVE_S3C2410_WATCHDOG if WATCHDOG
867 select HAVE_S3C_RTC if RTC_CLASS
861 select NEED_MACH_GPIO_H 868 select NEED_MACH_GPIO_H
862 select NEED_MACH_MEMORY_H 869 select NEED_MACH_MEMORY_H
863 help 870 help