diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 14:52:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 14:52:34 -0400 |
| commit | 0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be (patch) | |
| tree | 172582ed1e24905baad97c3390c3d03e8a6c1c50 /arch | |
| parent | b975dee3811ae0c58bd0e19cbd041cac8dd37ec5 (diff) | |
| parent | 4a911b1efe219fa3c8af697be0054c72e13bdae4 (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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-platform.c | 2 |
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) | |||
| 150 | return res; | 150 | return res; |
| 151 | 151 | ||
| 152 | /* Second HPC is missing? */ | 152 | /* Second HPC is missing? */ |
| 153 | if (!ip22_is_fullhouse() || | 153 | if (ip22_is_fullhouse() || |
| 154 | get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1])) | 154 | get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1])) |
| 155 | return 0; | 155 | return 0; |
| 156 | 156 | ||