Merge branch 'linux-2.6' into for-2.6.24

2007-10-03 15:33:17 +10:00
parent a0c7ce9c87 f778089cb2
commit 70f227d884
170 changed files with 2331 additions and 1607 deletions
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -97,6 +97,7 @@
 			#size-cells = <0>;
 			interrupt-parent = < &ipic >;
 			interrupts = <26 8>;
+			dr_mode = "peripheral";
 			phy_type = "ulpi";
 		};