diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
| commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /arch/mips/kernel/cpu-probe.c | |
| parent | aecfcde920da8d32949f6cbbc1fc051b4ef9e7be (diff) | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index a7162a4484cf..1bdbcad3bb74 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -149,6 +149,7 @@ void __init check_wait(void) | |||
| 149 | case CPU_R4650: | 149 | case CPU_R4650: |
| 150 | case CPU_R4700: | 150 | case CPU_R4700: |
| 151 | case CPU_R5000: | 151 | case CPU_R5000: |
| 152 | case CPU_R5500: | ||
| 152 | case CPU_NEVADA: | 153 | case CPU_NEVADA: |
| 153 | case CPU_4KC: | 154 | case CPU_4KC: |
| 154 | case CPU_4KEC: | 155 | case CPU_4KEC: |