aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-19 02:42:49 -0500
committerJason Cooper <jason@lakedaemon.net>2012-11-21 16:01:16 -0500
commit83a3ac3bd2b0c00591bd26e9ee7e48da3154f865 (patch)
tree1b226820d67fed22799e1e9466209458e12e0ea4
parent6431165fac43a8d48bf77a732791ac9138187a58 (diff)
ARM: Kirkwood: update defconfig for new boards
MPLCEC4_DT is relocated because it had been added manually. Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/configs/kirkwood_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 2fd4d259d866..1128d180eec6 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -28,12 +28,12 @@ CONFIG_MACH_LSXL_DT=y
28CONFIG_MACH_IOMEGA_IX2_200_DT=y 28CONFIG_MACH_IOMEGA_IX2_200_DT=y
29CONFIG_MACH_KM_KIRKWOOD_DT=y 29CONFIG_MACH_KM_KIRKWOOD_DT=y
30CONFIG_MACH_INETSPACE_V2_DT=y 30CONFIG_MACH_INETSPACE_V2_DT=y
31CONFIG_MACH_MPLCEC4_DT=y
31CONFIG_MACH_NETSPACE_V2_DT=y 32CONFIG_MACH_NETSPACE_V2_DT=y
32CONFIG_MACH_NETSPACE_MAX_V2_DT=y 33CONFIG_MACH_NETSPACE_MAX_V2_DT=y
33CONFIG_MACH_NETSPACE_LITE_V2_DT=y 34CONFIG_MACH_NETSPACE_LITE_V2_DT=y
34CONFIG_MACH_NETSPACE_MINI_V2_DT=y 35CONFIG_MACH_NETSPACE_MINI_V2_DT=y
35CONFIG_MACH_TOPKICK_DT=y 36CONFIG_MACH_TOPKICK_DT=y
36CONFIG_MACH_MPLCEC4_DT=y
37CONFIG_MACH_TS219=y 37CONFIG_MACH_TS219=y
38CONFIG_MACH_TS41X=y 38CONFIG_MACH_TS41X=y
39CONFIG_MACH_DOCKSTAR=y 39CONFIG_MACH_DOCKSTAR=y
@@ -47,6 +47,7 @@ CONFIG_MACH_D2NET_V2=y
47CONFIG_MACH_NET2BIG_V2=y 47CONFIG_MACH_NET2BIG_V2=y
48CONFIG_MACH_NET5BIG_V2=y 48CONFIG_MACH_NET5BIG_V2=y
49CONFIG_MACH_T5325=y 49CONFIG_MACH_T5325=y
50CONFIG_MACH_NSA310_DT=y
50# CONFIG_CPU_FEROCEON_OLD_ID is not set 51# CONFIG_CPU_FEROCEON_OLD_ID is not set
51CONFIG_PREEMPT=y 52CONFIG_PREEMPT=y
52CONFIG_AEABI=y 53CONFIG_AEABI=y