git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
setup.c
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index
00e1678
..
df770ad
100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-107,7
+107,7
@@
#include <asm/percpu.h>
#include <asm/topology.h>
#include <asm/apicdef.h>
-#include <asm/
k8
.h>
+#include <asm/
amd_nb
.h>
#ifdef CONFIG_X86_64
#include <asm/numa_64.h>
#endif