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-sim | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-mips/mach-sim')
| -rw-r--r-- | include/asm-mips/mach-sim/cpu-feature-overrides.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/mach-sim/cpu-feature-overrides.h b/include/asm-mips/mach-sim/cpu-feature-overrides.h index cadbe8eda79c..d9653e47d5fc 100644 --- a/include/asm-mips/mach-sim/cpu-feature-overrides.h +++ b/include/asm-mips/mach-sim/cpu-feature-overrides.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #ifdef CONFIG_CPU_MIPS32 | 16 | #ifdef CONFIG_CPU_MIPS32 |
| 17 | #define cpu_has_tlb 1 | 17 | #define cpu_has_tlb 1 |
| 18 | #define cpu_has_4kex 1 | 18 | #define cpu_has_4kex 1 |
| 19 | #define cpu_has_4kcache 1 | 19 | #define cpu_has_4k_cache 1 |
| 20 | #define cpu_has_fpu 0 | 20 | #define cpu_has_fpu 0 |
| 21 | /* #define cpu_has_32fpr ? */ | 21 | /* #define cpu_has_32fpr ? */ |
| 22 | #define cpu_has_counter 1 | 22 | #define cpu_has_counter 1 |
| @@ -41,7 +41,7 @@ | |||
| 41 | #ifdef CONFIG_CPU_MIPS64 | 41 | #ifdef CONFIG_CPU_MIPS64 |
| 42 | #define cpu_has_tlb 1 | 42 | #define cpu_has_tlb 1 |
| 43 | #define cpu_has_4kex 1 | 43 | #define cpu_has_4kex 1 |
| 44 | #define cpu_has_4kcache 1 | 44 | #define cpu_has_4k_cache 1 |
| 45 | /* #define cpu_has_fpu ? */ | 45 | /* #define cpu_has_fpu ? */ |
| 46 | /* #define cpu_has_32fpr ? */ | 46 | /* #define cpu_has_32fpr ? */ |
| 47 | #define cpu_has_counter 1 | 47 | #define cpu_has_counter 1 |