Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sparc / kernel / auxio_32.c

diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c
index ee8d214cae1efe81c900ce9e279baafdd856c5bc..35f48837871aaf8bb185eea89aab0ba1e281910b 100644 (file)
--- a/arch/sparc/kernel/auxio_32.c
+++ b/arch/sparc/kernel/auxio_32.c
@@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(auxio_lock);
 
 void __init auxio_probe(void)
 {
-       int node, auxio_nd;
+       phandle node, auxio_nd;
        struct linux_prom_registers auxregs[1];
        struct resource r;
 
@@ -113,7 +113,7 @@ volatile unsigned char * auxio_power_register = NULL;
 void __init auxio_power_probe(void)
 {
        struct linux_prom_registers regs;
-       int node;
+       phandle node;
        struct resource r;
 
        /* Attempt to find the sun4m power control node. */