projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
cpu
/
intel.c
diff --git
a/arch/x86/kernel/cpu/intel.c
b/arch/x86/kernel/cpu/intel.c
index 38766c2b5b003984bcc63e459e7cfb820c907473..1f7fdb91a818bc10d4b975a070d6b2c1a947b15b 100644
(file)
--- a/
arch/x86/kernel/cpu/intel.c
+++ b/
arch/x86/kernel/cpu/intel.c
@@
-8,7
+8,7
@@
#include <linux/module.h>
#include <linux/uaccess.h>
-#include <asm/
processor
.h>
+#include <asm/
cpufeature
.h>
#include <asm/pgtable.h>
#include <asm/msr.h>
#include <asm/bugs.h>