projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
exynos4_defconfig
diff --git
a/arch/arm/configs/exynos4_defconfig
b/arch/arm/configs/exynos4_defconfig
index
2ffba24
..
da53ff3
100644
(file)
--- a/
arch/arm/configs/exynos4_defconfig
+++ b/
arch/arm/configs/exynos4_defconfig
@@
-8,7
+8,9
@@
CONFIG_ARCH_EXYNOS4=y
CONFIG_S3C_LOWLEVEL_UART_PORT=1
CONFIG_MACH_SMDKC210=y
CONFIG_MACH_SMDKV310=y
+CONFIG_MACH_ARMLEX4210=y
CONFIG_MACH_UNIVERSAL_C210=y
+CONFIG_MACH_NURI=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y