Merge branch 'samsung/exynos-multiplatform' into next/multiplatform
authorOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:35:59 +0000 (11:35 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:35:59 +0000 (11:35 -0700)
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>
1  2 
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig

Simple merge
@@@ -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