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-linus' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
mach-ip28
/
cpu-feature-overrides.h
diff --git
a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
index 4cec06d133db238b785816bb9c0488e7caf3cd15..ba8b4e30b3e27ee45b470f8889d5afac3191f6c9 100644
(file)
--- a/
arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
+++ b/
arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
@@
-16,6
+16,7
@@
*/
#define cpu_has_watch 1
#define cpu_has_mips16 0
+#define cpu_has_mips16e2 0
#define cpu_has_divec 0
#define cpu_has_vce 0
#define cpu_has_cache_cdex_p 0