diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /include/asm-mips/mach-ja/cpu-feature-overrides.h | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-mips/mach-ja/cpu-feature-overrides.h')
| -rw-r--r-- | include/asm-mips/mach-ja/cpu-feature-overrides.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-ja/cpu-feature-overrides.h b/include/asm-mips/mach-ja/cpu-feature-overrides.h index 90ff087083b9..84b6dead0e8a 100644 --- a/include/asm-mips/mach-ja/cpu-feature-overrides.h +++ b/include/asm-mips/mach-ja/cpu-feature-overrides.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #define cpu_has_nofpuex 0 | 31 | #define cpu_has_nofpuex 0 |
| 32 | #define cpu_has_64bits 1 | 32 | #define cpu_has_64bits 1 |
| 33 | 33 | ||
| 34 | #define cpu_has_subset_pcaches 0 | 34 | #define cpu_has_inclusive_pcaches 0 |
| 35 | 35 | ||
| 36 | #define cpu_dcache_line_size() 32 | 36 | #define cpu_dcache_line_size() 32 |
| 37 | #define cpu_icache_line_size() 32 | 37 | #define cpu_icache_line_size() 32 |