Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] IP22: Fix detection of second HPC3 on Challenge S

Linus Torvalds 18 years ago 0b1fc335 b975dee3

+1 -1

1 changed file

expand all

arch

mips

sgi-ip22

ip22-platform.c

+1 -1

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

··· 150 150 return res; 151 151 152 152 /* Second HPC is missing? */ 153 - if (!ip22_is_fullhouse() || 153 + if (ip22_is_fullhouse() || 154 154 get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1])) 155 155 return 0; 156 156

Configure Feed

Configure Feed