Pull netlink into release branch

[~andy/linux] / include / asm-mips / mach-rm / cpu-feature-overrides.h

diff --git a/include/asm-mips/mach-rm/cpu-feature-overrides.h b/include/asm-mips/mach-rm/cpu-feature-overrides.h
index 11410ae10d36236aaaef1cc24d44578d5a570726..ccf5433635376aa1197be4b769516c940736e083 100644 (file)
--- a/include/asm-mips/mach-rm/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-rm/cpu-feature-overrides.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2003, 2004 Ralf Baechle
+ * Copyright (C) 2003, 04, 07 Ralf Baechle (ralf@linux-mips.org)
  *
  * SNI RM200 C apparently was only shipped with R4600 V2.0 and R5000 processors.
  */
@@ -21,9 +21,7 @@
 #define cpu_has_watch          0
 #define cpu_has_mips16         0
 #define cpu_has_divec          0
-#define cpu_has_vce            0
 #define cpu_has_cache_cdex_p   1
-#define cpu_has_cache_cdex_s   0
 #define cpu_has_prefetch       0
 #define cpu_has_mcheck         0
 #define cpu_has_ejtag          0
@@ -34,9 +32,8 @@
 #define cpu_has_dsp            0
 #define cpu_has_nofpuex                0
 #define cpu_has_64bits         1
-
-#define cpu_dcache_line_size() 32
-#define cpu_icache_line_size() 32
+#define cpu_has_mipsmt         0
+#define cpu_has_userlocal      0
 
 #define cpu_has_mips32r1       0
 #define cpu_has_mips32r2       0