diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-x86_64/cpufeature.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-x86_64/cpufeature.h')
| -rw-r--r-- | include/asm-x86_64/cpufeature.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/asm-x86_64/cpufeature.h b/include/asm-x86_64/cpufeature.h deleted file mode 100644 index 8baefc3beb2e..000000000000 --- a/include/asm-x86_64/cpufeature.h +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * cpufeature.h | ||
| 3 | * | ||
| 4 | * Defines x86 CPU feature bits | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef __ASM_X8664_CPUFEATURE_H | ||
| 8 | #define __ASM_X8664_CPUFEATURE_H | ||
| 9 | |||
| 10 | #include <asm-i386/cpufeature.h> | ||
| 11 | |||
| 12 | #undef cpu_has_vme | ||
| 13 | #define cpu_has_vme 0 | ||
| 14 | |||
| 15 | #undef cpu_has_pae | ||
| 16 | #define cpu_has_pae ___BUG___ | ||
| 17 | |||
| 18 | #undef cpu_has_mp | ||
| 19 | #define cpu_has_mp 1 /* XXX */ | ||
| 20 | |||
| 21 | #undef cpu_has_k6_mtrr | ||
| 22 | #define cpu_has_k6_mtrr 0 | ||
| 23 | |||
| 24 | #undef cpu_has_cyrix_arr | ||
| 25 | #define cpu_has_cyrix_arr 0 | ||
| 26 | |||
| 27 | #undef cpu_has_centaur_mcr | ||
| 28 | #define cpu_has_centaur_mcr 0 | ||
| 29 | |||
| 30 | #endif /* __ASM_X8664_CPUFEATURE_H */ | ||