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
This commit is contained in:
@@ -150,7 +150,7 @@ static int __init sgiseeq_devinit(void)
|
|||||||
return res;
|
return res;
|
||||||
|
|
||||||
/* Second HPC is missing? */
|
/* Second HPC is missing? */
|
||||||
if (!ip22_is_fullhouse() ||
|
if (ip22_is_fullhouse() ||
|
||||||
get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
|
get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user