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/mv64x60.c | |
| 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/mv64x60.c')
| -rw-r--r-- | arch/powerpc/boot/mv64x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/mv64x60.c b/arch/powerpc/boot/mv64x60.c index b43259455d4b..d9bb302b91d2 100644 --- a/arch/powerpc/boot/mv64x60.c +++ b/arch/powerpc/boot/mv64x60.c | |||
| @@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void) | |||
| 535 | u32 v[2]; | 535 | u32 v[2]; |
| 536 | void *devp; | 536 | void *devp; |
| 537 | 537 | ||
| 538 | devp = finddevice("/mv64x60"); | 538 | devp = find_node_by_compatible(NULL, "marvell,mv64360"); |
| 539 | if (devp == NULL) | 539 | if (devp == NULL) |
| 540 | goto err_out; | 540 | goto err_out; |
| 541 | if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v)) | 541 | if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v)) |
| @@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void) | |||
| 553 | u32 v; | 553 | u32 v; |
| 554 | void *devp; | 554 | void *devp; |
| 555 | 555 | ||
| 556 | devp = finddevice("/mv64x60"); | 556 | devp = find_node_by_compatible(NULL, "marvell,mv64360"); |
| 557 | if (devp == NULL) | 557 | if (devp == NULL) |
| 558 | goto err_out; | 558 | goto err_out; |
| 559 | if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) | 559 | if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) |