Add changes from the Linux-2.6 tree.

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

diff --git a/include/linux/numa.h b/include/linux/numa.h
index bd0c8c4..a31a730 100644 (file)
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -1,13 +1,10 @@
 #ifndef _LINUX_NUMA_H
 #define _LINUX_NUMA_H
 
-#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