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

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

diff --git a/arch/sparc/prom/misc_64.c b/arch/sparc/prom/misc_64.c
index 6cb1581..d24bc44 100644 (file)
--- a/arch/sparc/prom/misc_64.c
+++ b/arch/sparc/prom/misc_64.c
@@ -183,7 +183,8 @@ unsigned char prom_get_idprom(char *idbuf, int num_bytes)
 
 int prom_get_mmu_ihandle(void)
 {
-       int node, ret;
+       phandle node;
+       int ret;
 
        if (prom_mmu_ihandle_cache != 0)
                return prom_mmu_ihandle_cache;
@@ -201,7 +202,8 @@ int prom_get_mmu_ihandle(void)
 static int prom_get_memory_ihandle(void)
 {
        static int memory_ihandle_cache;
-       int node, ret;
+       phandle node;
+       int ret;
 
        if (memory_ihandle_cache != 0)
                return memory_ihandle_cache;