git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/futexes
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
srat_64.c
diff --git
a/arch/x86/mm/srat_64.c
b/arch/x86/mm/srat_64.c
index 09737c8af07479020e7183fef611c376e4fc1dad..574c8bc95ef05c9253214fc71d34371818f1c78e 100644
(file)
--- a/
arch/x86/mm/srat_64.c
+++ b/
arch/x86/mm/srat_64.c
@@
-20,7
+20,8
@@
#include <asm/proto.h>
#include <asm/numa.h>
#include <asm/e820.h>
-#include <asm/genapic.h>
+#include <asm/apic.h>
+#include <asm/uv/uv.h>
int acpi_numa __initdata;