git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
cpu.h
diff --git
a/arch/mips/include/asm/cpu.h
b/arch/mips/include/asm/cpu.h
index d0c152b989f8eea1f6d8380386f7997483329f70..ece9b84f3bcbd78511903c97269795dddd8f111d 100644
(file)
--- a/
arch/mips/include/asm/cpu.h
+++ b/
arch/mips/include/asm/cpu.h
@@
-285,11
+285,6
@@
enum cpu_type_enum {
CPU_R2000, CPU_R3000, CPU_R3000A, CPU_R3041, CPU_R3051, CPU_R3052,
CPU_R3081, CPU_R3081E,
- /*
- * R6000 class processors
- */
- CPU_R6000, CPU_R6000A,
-
/*
* R4000 class processors
*/