git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
83xx
/
mpc832x_rdb.c
diff --git
a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index
9f0fd88
..
e7f706b
100644
(file)
--- a/
arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/
arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@
-101,7
+101,7
@@
static void __init mpc832x_rdb_setup_arch(void)
#ifdef CONFIG_QUICC_ENGINE
qe_reset();
#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);
par_io_init(np);
of_node_put(np);