git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
cpu-probe.c
diff --git
a/arch/mips/kernel/cpu-probe.c
b/arch/mips/kernel/cpu-probe.c
index
a7162a4
..
1bdbcad
100644
(file)
--- a/
arch/mips/kernel/cpu-probe.c
+++ b/
arch/mips/kernel/cpu-probe.c
@@
-149,6
+149,7
@@
void __init check_wait(void)
case CPU_R4650:
case CPU_R4700:
case CPU_R5000:
+ case CPU_R5500:
case CPU_NEVADA:
case CPU_4KC:
case CPU_4KEC: