[NET]: add a top-level Networking menu to *config

[linux-2.6] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ce4dfa8b834dfec30367effa7b315a8be514f4e5..2e08942339ad0a3d46a4ac22959b6924d68d38e6 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -161,6 +161,8 @@ config IA64_PAGE_SIZE_64KB
 
 endchoice
 
+source kernel/Kconfig.hz
+
 config IA64_BRL_EMU
        bool
        depends on ITANIUM
@@ -197,7 +199,7 @@ config HOLES_IN_ZONE
        bool
        default y if VIRTUAL_MEM_MAP
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous memory support"
        depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
        default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
@@ -300,6 +302,8 @@ config PREEMPT
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 
+source "mm/Kconfig"
+
 config HAVE_DEC_LOCK
        bool
        depends on (SMP || PREEMPT)
@@ -419,6 +423,8 @@ endmenu
 
 endif
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"