From d012a7f91159ed96f0a60ba24d560c2b8ae6932c Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 3 Dec 2007 13:49:24 +1100
Subject: [PATCH] --- yaml --- r: 80994 b: refs/heads/master c:
 701172d1b8a90d87532e49b946966ff37f948cc2 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/boot/wrapper | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 46b5c5339e2b..bea9a61687c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928b9695592921957289d038ee75f613d9485a0a
+refs/heads/master: 701172d1b8a90d87532e49b946966ff37f948cc2
diff --git a/trunk/arch/powerpc/boot/wrapper b/trunk/arch/powerpc/boot/wrapper
index 221b8c87f57e..b8e4856af759 100755
--- a/trunk/arch/powerpc/boot/wrapper
+++ b/trunk/arch/powerpc/boot/wrapper
@@ -116,6 +116,9 @@ while [ "$#" -gt 0 ]; do
 done
 
 if [ -n "$dts" ]; then
+    if [ ! -r "$dts" -a -r "$object/dts/$dts" ]; then
+	dts="$object/dts/$dts"
+    fi
     if [ -z "$dtb" ]; then
 	dtb="$platform.dtb"
     fi