diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/powerpc/boot | |
parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/sequoia.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index f32829937aad..ab6dda372438 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -208,7 +208,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage | |||
208 | # | 208 | # |
209 | # Theses are default targets to build images which embed device tree blobs. | 209 | # Theses are default targets to build images which embed device tree blobs. |
210 | # They are only required on boards which do not have FDT support in firmware. | 210 | # They are only required on boards which do not have FDT support in firmware. |
211 | # Boards with newish u-boot firmare can use the uImage target above | 211 | # Boards with newish u-boot firmware can use the uImage target above |
212 | # | 212 | # |
213 | 213 | ||
214 | # Board ports in arch/powerpc/platform/40x/Kconfig | 214 | # Board ports in arch/powerpc/platform/40x/Kconfig |
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 @@ | |||
134 | }; | 134 | }; |
135 | 135 | ||
136 | USB1: usb@e0000400 { | 136 | USB1: usb@e0000400 { |
137 | compatible = "ohci-be"; | 137 | compatible = "ibm,usb-ohci-440epx", "ohci-be"; |
138 | reg = <0x00000000 0xe0000400 0x00000060>; | 138 | reg = <0x00000000 0xe0000400 0x00000060>; |
139 | interrupt-parent = <&UIC0>; | 139 | interrupt-parent = <&UIC0>; |
140 | interrupts = <0x15 0x8>; | 140 | interrupts = <0x15 0x8>; |