[PATCH] ia64: no discontig w/o NUMA

Currently the generic kernel won't build if you turn off NUMA
support.  Seems discontig support is too entangled with NUMA
support to live without it.  This patch makes it behave a bit
more friendly.

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 4914e070d8b9013e822158db068786f318822f0b..f91b2256216601cf1b2284462fa9505b3600d987 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -234,8 +234,8 @@ config IA64_NODESIZE_256GB
 endchoice
 
 config DISCONTIGMEM
-       bool "Discontiguous memory support" if (IA64_DIG && NUMA)
-       default y if IA64_SGI_SN2 || IA64_GENERIC
+       bool "Discontiguous memory support" if (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC) && NUMA
+       default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
        help
          Say Y to support efficient handling of discontiguous physical memory,
          for architectures which are either NUMA (Non-Uniform Memory Access)