Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history
…linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] IP22: Fix detection of second HPC3 on Challenge S
  • Loading branch information
torvalds committed Sep 9, 2008
2 parents b975dee + 4a911b1 commit 0b1fc33
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/mips/sgi-ip22/ip22-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 0b1fc33

Please sign in to comment.