linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / numa.h

diff --git a/include/linux/numa.h b/include/linux/numa.h
index a31a730..f0c539b 100644 (file)
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -1,10 +1,13 @@
 #ifndef _LINUX_NUMA_H
 #define _LINUX_NUMA_H
 
+#include <linux/config.h>
 
-#ifdef CONFIG_NODES_SHIFT
-#define NODES_SHIFT     CONFIG_NODES_SHIFT
-#else
+#ifndef CONFIG_FLATMEM
+#include <asm/numnodes.h>
+#endif
+
+#ifndef NODES_SHIFT
 #define NODES_SHIFT     0
 #endif