X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fnuma.h;fp=include%2Flinux%2Fnuma.h;h=e481feb1bfd81e061e3c2488ece336f936fdc9d6;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=bd0c8c4e9a95fb5d351e4712969293229724e347;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/include/linux/numa.h b/include/linux/numa.h
index bd0c8c4e9..e481feb1b 100644
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -3,11 +3,9 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_DISCONTIGMEM
-#include <asm/numnodes.h>
-#endif
-
-#ifndef NODES_SHIFT
+#ifdef CONFIG_NODES_SHIFT
+#define NODES_SHIFT     CONFIG_NODES_SHIFT
+#else
 #define NODES_SHIFT     0
 #endif