Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

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

diff --git a/include/linux/numa.h b/include/linux/numa.h
index bd0c8c4e9a95fb5d351e4712969293229724e347..f0c539bd3cfc44e07eaafc26bcf358c29c0fc65f 100644 (file)
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -3,7 +3,7 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_DISCONTIGMEM
+#ifndef CONFIG_FLATMEM
 #include <asm/numnodes.h>
 #endif