diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
tree | 351a40b72514d620e5bebea2de38c26f23277ffc /include/asm-mips/mach-mips/cpu-feature-overrides.h | |
parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-mips/mach-mips/cpu-feature-overrides.h')
-rw-r--r-- | include/asm-mips/mach-mips/cpu-feature-overrides.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/mach-mips/cpu-feature-overrides.h b/include/asm-mips/mach-mips/cpu-feature-overrides.h index e06af6c86f86..12c937283bb4 100644 --- a/include/asm-mips/mach-mips/cpu-feature-overrides.h +++ b/include/asm-mips/mach-mips/cpu-feature-overrides.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #ifdef CONFIG_CPU_MIPS32 | 17 | #ifdef CONFIG_CPU_MIPS32 |
18 | #define cpu_has_tlb 1 | 18 | #define cpu_has_tlb 1 |
19 | #define cpu_has_4kex 1 | 19 | #define cpu_has_4kex 1 |
20 | #define cpu_has_4kcache 1 | 20 | #define cpu_has_4k_cache 1 |
21 | /* #define cpu_has_fpu ? */ | 21 | /* #define cpu_has_fpu ? */ |
22 | /* #define cpu_has_32fpr ? */ | 22 | /* #define cpu_has_32fpr ? */ |
23 | #define cpu_has_counter 1 | 23 | #define cpu_has_counter 1 |
@@ -47,7 +47,7 @@ | |||
47 | #ifdef CONFIG_CPU_MIPS64 | 47 | #ifdef CONFIG_CPU_MIPS64 |
48 | #define cpu_has_tlb 1 | 48 | #define cpu_has_tlb 1 |
49 | #define cpu_has_4kex 1 | 49 | #define cpu_has_4kex 1 |
50 | #define cpu_has_4kcache 1 | 50 | #define cpu_has_4k_cache 1 |
51 | /* #define cpu_has_fpu ? */ | 51 | /* #define cpu_has_fpu ? */ |
52 | /* #define cpu_has_32fpr ? */ | 52 | /* #define cpu_has_32fpr ? */ |
53 | #define cpu_has_counter 1 | 53 | #define cpu_has_counter 1 |