diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 14:35:59 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 14:35:59 -0400 |
| commit | 772ba2ffd2033ecc4451c10b20c01814156ee1b1 (patch) | |
| tree | c3d7b3f1441bd900e3c8e22e1c37eed954c2fd41 /arch/arm/configs | |
| parent | f19814721e24cac152348872ff38f38a3b45852a (diff) | |
| parent | 4923ee444a39c8b75027ed01a7812e940194dbec (diff) | |
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 ae90a0f7d53c..bffe68e190a3 100644 --- a/arch/arm/configs/exynos4_defconfig +++ b/arch/arm/configs/exynos4_defconfig | |||
| @@ -4,7 +4,7 @@ CONFIG_KALLSYMS_ALL=y | |||
| 4 | CONFIG_MODULES=y | 4 | CONFIG_MODULES=y |
| 5 | CONFIG_MODULE_UNLOAD=y | 5 | CONFIG_MODULE_UNLOAD=y |
| 6 | # CONFIG_BLK_DEV_BSG is not set | 6 | # CONFIG_BLK_DEV_BSG is not set |
| 7 | CONFIG_ARCH_EXYNOS_SINGLE=y | 7 | CONFIG_ARCH_EXYNOS=y |
| 8 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | 8 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 |
| 9 | CONFIG_MACH_SMDKC210=y | 9 | CONFIG_MACH_SMDKC210=y |
| 10 | CONFIG_MACH_ARMLEX4210=y | 10 | CONFIG_MACH_ARMLEX4210=y |