From 89a99c3d9140043ba16187a9f1042ddc86252ee9 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 25 Mar 2011 10:30:08 +0900
Subject: [PATCH] --- yaml --- r: 252380 b: refs/heads/master c:
 14587b8d4be652fccc8e0e82ae9baa4365b06d9b h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/configs/exynos4_defconfig | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b083d6aa44fa..0b2035afd9f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3260ecd859ba842c709f205cbc01408b826bb387
+refs/heads/master: 14587b8d4be652fccc8e0e82ae9baa4365b06d9b
diff --git a/trunk/arch/arm/configs/exynos4_defconfig b/trunk/arch/arm/configs/exynos4_defconfig
index 2ffba24d2e2a..da53ff3b4d70 100644
--- a/trunk/arch/arm/configs/exynos4_defconfig
+++ b/trunk/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