diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:21:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:21:02 -0800 |
| commit | b4a2c87dada12010239b4d5f8f9bc0eb964a614f (patch) | |
| tree | b33903197ae17defc3d61b8d8d744a3e87c22686 /arch/powerpc/platforms/83xx/mpc832x_mds.c | |
| parent | e45521a8d44da2c4efd17fc8e853f7917e99b57a (diff) | |
| parent | e89debcd18a3ef74b27894e479d6b9e658fc6de6 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Update defconfigs
[POWERPC] atomic_dec_if_positive sign extension fix
[POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code
[POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable
[POWERPC] Fix broken DMA on non-LPAR pSeries
[POWERPC] Fix cell's mmio nvram to properly parse device tree
[POWERPC] Remove bogus sanity check in pci -> OF node code
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc832x_mds.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index f58c9780b66..4d471190be8 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -103,7 +103,7 @@ static void __init mpc832x_sys_setup_arch(void) #ifdef CONFIG_QUICC_ENGINE qe_reset(); - if ((np = of_find_node_by_name(np, "par_io")) != NULL) { + if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { par_io_init(np); of_node_put(np); |