From: Olof Johansson Date: Fri, 26 Apr 2013 18:35:59 +0000 (-0700) Subject: Merge branch 'samsung/exynos-multiplatform' into next/multiplatform X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=772ba2ffd2033ecc4451c10b20c01814156ee1b1;p=linux-beck.git Merge branch 'samsung/exynos-multiplatform' into next/multiplatform This just merges in the revert of multiplatform support. Not doing it by cherry-pick since we need the same revert in the next/drivers branch. * samsung/exynos-multiplatform: Revert "ARM: exynos: enable multiplatform support" Signed-off-by: Olof Johansson --- 772ba2ffd2033ecc4451c10b20c01814156ee1b1 diff --cc arch/arm/mach-exynos/Kconfig index 9cfbb33a9eea,d8c251b13ab8..4b8b9ec91ff4 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@@ -34,12 -19,8 +20,9 @@@ config ARCH_EXYNOS help Samsung EXYNOS4 SoCs based systems - config ARCH_EXYNOS4_SINGLE - def_bool ARCH_EXYNOS4 && ARCH_EXYNOS_SINGLE - config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" + select HAVE_ARM_SCU if SMP select HAVE_SMP help Samsung EXYNOS5 (Cortex-A15) SoC based systems