diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 17:13:09 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 17:13:09 +0900 |
| commit | 2520123382e97271e932377c83bca010c265be55 (patch) | |
| tree | 1403c6c4ea400be832322cd84acee93cd49076e7 /arch/arm/configs | |
| parent | be4ab3616839c26caf914449de3a22458f53f6e5 (diff) | |
| parent | 699efdd2d34c535f415516e06d3d9f0bed131664 (diff) | |
Merge branch 'next-samsung-board-v3.1' into next-samsung-board
Conflicts:
arch/arm/mach-exynos4/Kconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/exynos4_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig index da53ff3b4d7..cd40bb56e56 100644 --- a/arch/arm/configs/exynos4_defconfig +++ b/arch/arm/configs/exynos4_defconfig @@ -11,6 +11,7 @@ CONFIG_MACH_SMDKV310=y CONFIG_MACH_ARMLEX4210=y CONFIG_MACH_UNIVERSAL_C210=y CONFIG_MACH_NURI=y +CONFIG_MACH_ORIGEN=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y |