diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /include/asm-mips/mach-ip27/cpu-feature-overrides.h | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'include/asm-mips/mach-ip27/cpu-feature-overrides.h')
| -rw-r--r-- | include/asm-mips/mach-ip27/cpu-feature-overrides.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-mips/mach-ip27/cpu-feature-overrides.h b/include/asm-mips/mach-ip27/cpu-feature-overrides.h index fe076380c189..7d3112b148d9 100644 --- a/include/asm-mips/mach-ip27/cpu-feature-overrides.h +++ b/include/asm-mips/mach-ip27/cpu-feature-overrides.h | |||
| @@ -34,7 +34,11 @@ | |||
| 34 | #define cpu_has_64bits 1 | 34 | #define cpu_has_64bits 1 |
| 35 | 35 | ||
| 36 | #define cpu_has_4kex 1 | 36 | #define cpu_has_4kex 1 |
| 37 | #define cpu_has_3k_cache 0 | ||
| 38 | #define cpu_has_6k_cache 0 | ||
| 37 | #define cpu_has_4k_cache 1 | 39 | #define cpu_has_4k_cache 1 |
| 40 | #define cpu_has_8k_cache 0 | ||
| 41 | #define cpu_has_tx39_cache 0 | ||
| 38 | 42 | ||
| 39 | #define cpu_has_inclusive_pcaches 1 | 43 | #define cpu_has_inclusive_pcaches 1 |
| 40 | 44 | ||