diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-26 11:35:59 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-26 11:35:59 -0700 |
commit | 772ba2ffd2033ecc4451c10b20c01814156ee1b1 (patch) | |
tree | c3d7b3f1441bd900e3c8e22e1c37eed954c2fd41 /arch/arm/configs | |
parent | f19814721e24cac152348872ff38f38a3b45852a (diff) | |
parent | 4923ee444a39c8b75027ed01a7812e940194dbec (diff) | |
download | op-kernel-dev-772ba2ffd2033ecc4451c10b20c01814156ee1b1.zip op-kernel-dev-772ba2ffd2033ecc4451c10b20c01814156ee1b1.tar.gz |
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>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/exynos4_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig index ae90a0f..bffe68e 100644 --- a/arch/arm/configs/exynos4_defconfig +++ b/arch/arm/configs/exynos4_defconfig @@ -4,7 +4,7 @@ CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_EXYNOS_SINGLE=y +CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=1 CONFIG_MACH_SMDKC210=y CONFIG_MACH_ARMLEX4210=y |