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 <olof@lixom.net>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
index 9cfbb33a9eeaac1c13b1e1a9105d02053f95228c,d8c251b13ab8210b928848bbc8796adb56dd333a..4b8b9ec91ff48bdad9b6b43d28594bf939453c66
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/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