Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[mv-sheeva.git] / include / asm-x86 / numa_32.h

diff --git a/include/asm-x86/numa_32.h b/include/asm-x86/numa_32.h
index ed6c88eac848ea06b5a55dffa5bc66f7e1ae5cc5..220d7b7707a02be8d82232d5395732a6f9a3efa2 100644 (file)
--- a/include/asm-x86/numa_32.h
+++ b/include/asm-x86/numa_32.h
@@ -5,12 +5,7 @@ extern int pxm_to_nid(int pxm);
 extern void numa_remove_cpu(int cpu);
 
 #ifdef CONFIG_NUMA
-extern void __init remap_numa_kva(void);
 extern void set_highmem_pages_init(void);
-#else
-static inline void remap_numa_kva(void)
-{
-}
 #endif
 
 #endif /* _ASM_X86_32_NUMA_H */