X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fnuma.h;h=e481feb1bfd81e061e3c2488ece336f936fdc9d6;hb=a82642fa190029a438c0d09edb0e5463a0fe9e1e;hp=f0c539bd3cfc44e07eaafc26bcf358c29c0fc65f;hpb=603fff54420a0ccc4c3b48bfef43896fb4e33161;p=linux-2.6-omap-h63xx.git

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