diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-13 15:38:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-13 15:38:11 -0400 |
| commit | 76df73ff90e99681a99e457aec4cfe0a240b7982 (patch) | |
| tree | 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a /arch/mips/kernel/cpu-probe.c | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
| parent | 86bc843a268058df558844b6bf64531617fbc698 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index bef3e2dc7c52..8c2c359a05f4 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -655,7 +655,7 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) | |||
| 655 | case PRID_IMP_SB1: | 655 | case PRID_IMP_SB1: |
| 656 | c->cputype = CPU_SB1; | 656 | c->cputype = CPU_SB1; |
| 657 | /* FPU in pass1 is known to have issues. */ | 657 | /* FPU in pass1 is known to have issues. */ |
| 658 | if ((c->processor_id & 0xff) < 0x20) | 658 | if ((c->processor_id & 0xff) < 0x02) |
| 659 | c->options &= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR); | 659 | c->options &= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR); |
| 660 | break; | 660 | break; |
| 661 | case PRID_IMP_SB1A: | 661 | case PRID_IMP_SB1A: |