From 1248f06de055bb23fbb9fedae9aaa590a18879e9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 16:39:47 +0100
Subject: [PATCH] --- yaml --- r: 340223 b: refs/heads/master c:
 6431165fac43a8d48bf77a732791ac9138187a58 h: refs/heads/master i:   340221:
 01d1a8cf775ecd89b468dcfe0607b430f4d54e97   340219:
 b8d40d2a075a40aed786f59647acb685be4177ac   340215:
 90f667d54995ce1dddbee8cf95dd77dc815082d2   340207:
 0ad1822fc2165ef921b66b90281f7b4987b1b4ef   340191:
 46eac919436922784ed440a596727f893b86ad58   340159:
 fa3bc8347a1573084df39a8bf186c4d41035e061   340095:
 28fa18f015dfbab623bc3492e42b410c8104a7a8   339967:
 a59e057f8634dc03245ef391cd8791eb8efe6db4 v: v3

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

diff --git a/[refs] b/[refs]
index f31ae3fd917e..f9ea74f2debd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f645df9ff2550749b806af626576d5ad418215
+refs/heads/master: 6431165fac43a8d48bf77a732791ac9138187a58
diff --git a/trunk/arch/arm/configs/orion5x_defconfig b/trunk/arch/arm/configs/orion5x_defconfig
index d0875ceb0cee..952430d9e2d9 100644
--- a/trunk/arch/arm/configs/orion5x_defconfig
+++ b/trunk/arch/arm/configs/orion5x_defconfig
@@ -27,7 +27,7 @@ CONFIG_MACH_TS409=y
 CONFIG_MACH_WRT350N_V2=y
 CONFIG_MACH_TS78XX=y
 CONFIG_MACH_MV2120=y
-CONFIG_MACH_EDMINI_V2=y
+CONFIG_MACH_EDMINI_V2_DT=y
 CONFIG_MACH_D2NET=y
 CONFIG_MACH_BIGDISK=y
 CONFIG_MACH_NET2BIG=y
@@ -40,6 +40,7 @@ CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NET=y
@@ -94,6 +95,7 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set