Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion

[mv-sheeva.git] / arch / sparc / mm / sun4c.c

diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 4289f90f86972f6020318bf002162fccf5a968e8..ddd0d86e508ecff9924ebd2aef5fe262eb77906c 100644 (file)
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -420,7 +420,7 @@ volatile unsigned long __iomem *sun4c_memerr_reg = NULL;
 
 void __init sun4c_probe_memerr_reg(void)
 {
-       int node;
+       phandle node;
        struct linux_prom_registers regs[1];
 
        node = prom_getchild(prom_root_node);