diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
commit | d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch) | |
tree | 250be7a5a29069f7d1f4524fa45ab0e988833025 /arch/powerpc/boot/dts/sequoia.dts | |
parent | itimers: remove the per-cpu-ish-ness (diff) | |
parent | Linux 2.6.29-rc1 (diff) | |
download | linux-d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a.tar.xz linux-d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a.zip |
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'arch/powerpc/boot/dts/sequoia.dts')
-rw-r--r-- | arch/powerpc/boot/dts/sequoia.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts index 3b295e8df53f..43cc68bd3192 100644 --- 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>; |