diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /arch/powerpc/boot/dts/haleakala.dts | |
parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
Diffstat (limited to 'arch/powerpc/boot/dts/haleakala.dts')
-rw-r--r-- | arch/powerpc/boot/dts/haleakala.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts index ae68fefc01b6..b5d95ac24dbf 100644 --- a/arch/powerpc/boot/dts/haleakala.dts +++ b/arch/powerpc/boot/dts/haleakala.dts | |||
@@ -12,7 +12,7 @@ | |||
12 | #address-cells = <1>; | 12 | #address-cells = <1>; |
13 | #size-cells = <1>; | 13 | #size-cells = <1>; |
14 | model = "amcc,haleakala"; | 14 | model = "amcc,haleakala"; |
15 | compatible = "amcc,kilauea"; | 15 | compatible = "amcc,haleakala", "amcc,kilauea"; |
16 | dcr-parent = <&/cpus/cpu@0>; | 16 | dcr-parent = <&/cpus/cpu@0>; |
17 | 17 | ||
18 | aliases { | 18 | aliases { |
@@ -218,7 +218,7 @@ | |||
218 | mal-tx-channel = <0>; | 218 | mal-tx-channel = <0>; |
219 | mal-rx-channel = <0>; | 219 | mal-rx-channel = <0>; |
220 | cell-index = <0>; | 220 | cell-index = <0>; |
221 | max-frame-size = <5dc>; | 221 | max-frame-size = <2328>; |
222 | rx-fifo-size = <1000>; | 222 | rx-fifo-size = <1000>; |
223 | tx-fifo-size = <800>; | 223 | tx-fifo-size = <800>; |
224 | phy-mode = "rgmii"; | 224 | phy-mode = "rgmii"; |