Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b1fc335 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b975dee3 4a911b1e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;