aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 11:52:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 11:52:34 -0700
commit0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be (patch)
tree172582ed1e24905baad97c3390c3d03e8a6c1c50
parentb975dee3811ae0c58bd0e19cbd041cac8dd37ec5 (diff)
parent4a911b1efe219fa3c8af697be0054c72e13bdae4 (diff)
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
-rw-r--r--arch/mips/sgi-ip22/ip22-platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index 60141235ec40..52486c4d2b01 100644
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -150,7 +150,7 @@ static int __init sgiseeq_devinit(void)
return res;
/* Second HPC is missing? */
- if (!ip22_is_fullhouse() ||
+ if (ip22_is_fullhouse() ||
get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
return 0;

Privacy Policy