Merge commit 'origin/master' into next

2009-01-08 16:24:38 +11:00
parent 4aa12f7b92 9e42d0cf50
commit 24f030175d
3507 changed files with 615309 additions and 76520 deletions
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -134,7 +134,7 @@
 		};

 		USB1: usb@e0000400 {
-			compatible = "ohci-be";
+			compatible = "ibm,usb-ohci-440epx", "ohci-be";
 			reg = <0x00000000 0xe0000400 0x00000060>;
 			interrupt-parent = <&UIC0>;
 			interrupts = <0x15 0x8>;