Merge branch 'master' into csb1725

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

diff --git a/arch/sparc/kernel/starfire.c b/arch/sparc/kernel/starfire.c
index 060d0f3a61511ee2b1891837ea4de94ca398d69c..a4446c0fb7a1c7220084c035f804e34d084c7a48 100644 (file)
--- a/arch/sparc/kernel/starfire.c
+++ b/arch/sparc/kernel/starfire.c
@@ -23,7 +23,7 @@ int this_is_starfire = 0;
 
 void check_if_starfire(void)
 {
-       int ssnode = prom_finddevice("/ssp-serial");
+       phandle ssnode = prom_finddevice("/ssp-serial");
        if (ssnode != 0 && ssnode != -1)
                this_is_starfire = 1;
 }