diff --git a/[refs] b/[refs]
index 0fdb7ca2f141..ec2ed86e927f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc36367211931cd503f050e4ceff5d9864cec817
+refs/heads/master: c9ff03428f24219b927d9d9d3c0c581622967794
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 3d6926ba8995..2d8fdc05f415 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -17,6 +17,7 @@
 #include <asm/dma.h>
 #include <asm/numa.h>
 #include <asm/acpi.h>
+#include <asm/k8.h>
 
 #ifndef Dprintk
 #define Dprintk(x...)
diff --git a/trunk/include/asm-x86/k8.h b/trunk/include/asm-x86/k8.h
index 699dd6961eda..452e2b696ff4 100644
--- a/trunk/include/asm-x86/k8.h
+++ b/trunk/include/asm-x86/k8.h
@@ -10,5 +10,6 @@ extern struct pci_dev **k8_northbridges;
 extern int num_k8_northbridges;
 extern int cache_k8_northbridges(void);
 extern void k8_flush_garts(void);
+extern int k8_scan_nodes(unsigned long start, unsigned long end);
 
 #endif
diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
index 77b4177d17f5..9b96dae5b7ac 100644
--- a/trunk/include/asm-x86/proto.h
+++ b/trunk/include/asm-x86/proto.h
@@ -40,8 +40,6 @@ extern int nohpet;
 
 extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
 
-extern int k8_scan_nodes(unsigned long start, unsigned long end);
-
 extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
 extern unsigned long numa_free_all_bootmem(void);