Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

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

diff --git a/include/linux/numa.h b/include/linux/numa.h
index f0c539bd3cfc44e07eaafc26bcf358c29c0fc65f..a31a7301b159e8b1b8036a14cf734dd55ec0d0e2 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>
 
-#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