diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /include/asm-mips/mach-ip22/cpu-feature-overrides.h | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'include/asm-mips/mach-ip22/cpu-feature-overrides.h')
| -rw-r--r-- | include/asm-mips/mach-ip22/cpu-feature-overrides.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-ip22/cpu-feature-overrides.h b/include/asm-mips/mach-ip22/cpu-feature-overrides.h index 2a37bedb4053..f7c5dc8a5336 100644 --- a/include/asm-mips/mach-ip22/cpu-feature-overrides.h +++ b/include/asm-mips/mach-ip22/cpu-feature-overrides.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #define cpu_has_tlb 1 | 14 | #define cpu_has_tlb 1 |
| 15 | #define cpu_has_4kex 1 | 15 | #define cpu_has_4kex 1 |
| 16 | #define cpu_has_4kcache 1 | 16 | #define cpu_has_4k_cache 1 |
| 17 | #define cpu_has_fpu 1 | 17 | #define cpu_has_fpu 1 |
| 18 | #define cpu_has_32fpr 1 | 18 | #define cpu_has_32fpr 1 |
| 19 | #define cpu_has_counter 1 | 19 | #define cpu_has_counter 1 |