Merge tag 'v2.6.38' 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 35f48837871aaf8bb185eea89aab0ba1e281910b..8505e0ac78baaf27331681302961f1bb7e173154 100644 (file)
--- a/arch/sparc/kernel/auxio_32.c
+++ b/arch/sparc/kernel/auxio_32.c
@@ -121,7 +121,7 @@ void __init auxio_power_probe(void)
        node = prom_searchsiblings(node, "obio");
        node = prom_getchild(node);
        node = prom_searchsiblings(node, "power");
-       if (node == 0 || node == -1)
+       if (node == 0 || (s32)node == -1)
                return;
 
        /* Map the power control register. */