From 15e879c648f68fea541a5422595009215b254d98 Mon Sep 17 00:00:00 2001
From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 19 Nov 2012 07:42:49 +0000
Subject: [PATCH] --- yaml --- r: 340224 b: refs/heads/master c:
 83a3ac3bd2b0c00591bd26e9ee7e48da3154f865 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/configs/kirkwood_defconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9ea74f2debd..78bd3b1363b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6431165fac43a8d48bf77a732791ac9138187a58
+refs/heads/master: 83a3ac3bd2b0c00591bd26e9ee7e48da3154f865
diff --git a/trunk/arch/arm/configs/kirkwood_defconfig b/trunk/arch/arm/configs/kirkwood_defconfig
index 2fd4d259d866..1128d180eec6 100644
--- a/trunk/arch/arm/configs/kirkwood_defconfig
+++ b/trunk/arch/arm/configs/kirkwood_defconfig
@@ -28,12 +28,12 @@ CONFIG_MACH_LSXL_DT=y
 CONFIG_MACH_IOMEGA_IX2_200_DT=y
 CONFIG_MACH_KM_KIRKWOOD_DT=y
 CONFIG_MACH_INETSPACE_V2_DT=y
+CONFIG_MACH_MPLCEC4_DT=y
 CONFIG_MACH_NETSPACE_V2_DT=y
 CONFIG_MACH_NETSPACE_MAX_V2_DT=y
 CONFIG_MACH_NETSPACE_LITE_V2_DT=y
 CONFIG_MACH_NETSPACE_MINI_V2_DT=y
 CONFIG_MACH_TOPKICK_DT=y
-CONFIG_MACH_MPLCEC4_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@@ -47,6 +47,7 @@ CONFIG_MACH_D2NET_V2=y
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
 CONFIG_MACH_T5325=y
+CONFIG_MACH_NSA310_DT=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y