summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/auxio_32.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 23:06:06 (GMT)
committerLen Brown <len.brown@intel.com>2011-01-12 23:06:06 (GMT)
commit56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch)
treeb902491aef3a99efe0d9d49edd0f6e414dba654f /arch/sparc/kernel/auxio_32.c
parent2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff)
parentf878133bf022717b880d0e0995b8f91436fd605c (diff)
downloadlinux-56dbed129df3fdd4caf9018b6e7599ee258a5420.tar.xz
Merge branch 'linus' into idle-test
Diffstat (limited to 'arch/sparc/kernel/auxio_32.c')
-rw-r--r--arch/sparc/kernel/auxio_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c
index 35f4883..8505e0a 100644
--- 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. */