This commit was manufactured by cvs2svn to create branch

[linux-2.6.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 72b48fb..7eef15f 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -44,10 +44,7 @@ choice
 
 config IA64_GENERIC
        bool "generic"
-       select NUMA
-       select ACPI_NUMA
        select VIRTUAL_MEM_MAP
-       select DISCONTIGMEM
        help
          This selects the system type of your hardware.  A "generic" kernel
          will run on any supported IA-64 system.  However, if you configure
@@ -486,6 +483,8 @@ config SYSVIPC_COMPAT
        default y
 endmenu
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"