diff --git a/[refs] b/[refs] index 9ecc3d156c74..2813f84868c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8267c1a36864fc30a2ce01f4349a8f2931ae741 +refs/heads/master: b93eeba49efb30f88a83fc97ad22c255605654a1 diff --git a/trunk/arch/powerpc/platforms/85xx/mpc8536_ds.c b/trunk/arch/powerpc/platforms/85xx/mpc8536_ds.c index 71d7c038961f..6b846aa1ced9 100644 --- a/trunk/arch/powerpc/platforms/85xx/mpc8536_ds.c +++ b/trunk/arch/powerpc/platforms/85xx/mpc8536_ds.c @@ -36,7 +36,7 @@ void __init mpc8536_ds_pic_init(void) struct resource r; struct device_node *np; - np = of_find_node_by_type(np, "open-pic"); + np = of_find_node_by_type(NULL, "open-pic"); if (np == NULL) { printk(KERN_ERR "Could not find open-pic node\n"); return; diff --git a/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c index 8b2d63d4264e..25f41cd2d33a 100644 --- a/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -64,7 +64,7 @@ void __init mpc85xx_ds_pic_init(void) int cascade_irq; #endif - np = of_find_node_by_type(np, "open-pic"); + np = of_find_node_by_type(NULL, "open-pic"); if (np == NULL) { printk(KERN_ERR "Could not find open-pic node\n"); return;