commit 0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be
author Linus Torvalds <torvalds@linux-foundation.org> Tue Sep 09 11:52:34 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Sep 09 11:52:34 2008 -0700
tree 172582ed1e24905baad97c3390c3d03e8a6c1c50
parent b975dee3811ae0c58bd0e19cbd041cac8dd37ec5
parent 4a911b1efe219fa3c8af697be0054c72e13bdae4

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] IP22: Fix detection of second HPC3 on Challenge S

arch/mips/sgi-ip22/ip22-platform.c

diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index 6014123..52486c4d 100644
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -150,7 +150,7 @@
 		return res;
 
 	/* Second HPC is missing? */
-	if (!ip22_is_fullhouse() ||
+	if (ip22_is_fullhouse() ||
 	    get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
 		return 0;