From 994ff16618dbd9678322cd0c4604de767fab1ab8 Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips@freescale.com>
Date: Thu, 22 Apr 2010 19:25:13 -0500
Subject: [PATCH] --- yaml --- r: 196647 b: refs/heads/master c:
 18f397c838e50bb2b8d581dcfc73f3d35ee5b1e2 h: refs/heads/master i:   196645:
 ff53fe3a18a19d49bfcc457ee210556057dd1802   196643:
 0d55933983e5c8c06dafad5531b88085b2eca067   196639:
 378e464a514f5e3b2d1127357e11ad65f1a0f683 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/boot/dts/mpc8315erdb.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7a6fca0ee3d..816bfaa47da9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 345e5c8a1cc30ebd527bcc122d9540538942f1ba
+refs/heads/master: 18f397c838e50bb2b8d581dcfc73f3d35ee5b1e2
diff --git a/trunk/arch/powerpc/boot/dts/mpc8315erdb.dts b/trunk/arch/powerpc/boot/dts/mpc8315erdb.dts
index 8a3a4f3ef831..508b770d3dd6 100644
--- a/trunk/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/trunk/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -292,7 +292,7 @@
 			fsl,num-channels = <4>;
 			fsl,channel-fifo-len = <24>;
 			fsl,exec-units-mask = <0x97c>;
-			fsl,descriptor-types-mask = <0x3ab0abf>;
+			fsl,descriptor-types-mask = <0x3a30abf>;
 		};
 
 		sata@18000 {