projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-2.6-microblaze.git]
/
arch
/
x86
/
include
/
asm
/
cpufeature.h
diff --git
a/arch/x86/include/asm/cpufeature.h
b/arch/x86/include/asm/cpufeature.h
index
1d337c5
..
58acda5
100644
(file)
--- a/
arch/x86/include/asm/cpufeature.h
+++ b/
arch/x86/include/asm/cpufeature.h
@@
-22,8
+22,8
@@
enum cpuid_leafs
CPUID_LNX_3,
CPUID_7_0_EBX,
CPUID_D_1_EAX,
- CPUID_
F_0_EDX
,
- CPUID_
F_1_ED
X,
+ CPUID_
LNX_4
,
+ CPUID_
7_1_EA
X,
CPUID_8000_0008_EBX,
CPUID_6_EAX,
CPUID_8000_000A_EDX,