projects
/
cascardo
/
linux.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
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
intel-family.h
diff --git
a/arch/x86/include/asm/intel-family.h
b/arch/x86/include/asm/intel-family.h
index
9ae5ab8
..
34a46dc
100644
(file)
--- a/
arch/x86/include/asm/intel-family.h
+++ b/
arch/x86/include/asm/intel-family.h
@@
-64,5
+64,6
@@
/* Xeon Phi */
#define INTEL_FAM6_XEON_PHI_KNL 0x57 /* Knights Landing */
+#define INTEL_FAM6_XEON_PHI_KNM 0x85 /* Knights Mill */
#endif /* _ASM_X86_INTEL_FAMILY_H */