Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[pandora-kernel.git] / arch / sparc / prom / memory.c

diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c
index fac7899..3f263a6 100644 (file)
--- a/arch/sparc/prom/memory.c
+++ b/arch/sparc/prom/memory.c
@@ -31,7 +31,8 @@ static int __init prom_meminit_v0(void)
 static int __init prom_meminit_v2(void)
 {
        struct linux_prom_registers reg[64];
-       int node, size, num_ents, i;
+       phandle node;
+       int size, num_ents, i;
 
        node = prom_searchsiblings(prom_getchild(prom_root_node), "memory");
        size = prom_getproperty(node, "available", (char *) reg, sizeof(reg));