This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 23db325..0892350 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -72,8 +72,7 @@ config HPET_TIMER
          If unsure, say Y.
 
 config HPET_EMULATE_RTC
-       bool "Provide RTC interrupt"
-       depends on HPET_TIMER && RTC=y
+       def_bool HPET_TIMER && RTC=y
 
 config GENERIC_ISA_DMA
        bool
@@ -256,7 +255,6 @@ config SCHED_SMT
 
 config K8_NUMA
        bool "K8 NUMA support"
-       select NUMA
        depends on SMP
        help
          Enable NUMA (Non Unified Memory Architecture) support for
@@ -266,23 +264,15 @@ config K8_NUMA
          This code is recommended on all multiprocessor Opteron systems
          and normally doesn't hurt on others.
 
-config NUMA_EMU
-       bool "NUMA emulation support"
-       select NUMA
-       depends on SMP
-       help
-         Enable NUMA emulation. A flat machine will be split
-         into virtual nodes when booted with "numa=fake=N", where N is the
-         number of nodes. This is only useful for debugging.
-
 config DISCONTIGMEM
        bool
-       depends on NUMA
+       depends on K8_NUMA
        default y
 
 config NUMA
        bool
-       default n
+       depends on K8_NUMA
+       default y
 
 config HAVE_DEC_LOCK
        bool
@@ -306,7 +296,6 @@ config NR_CPUS
 
 config GART_IOMMU
        bool "IOMMU support"
-       depends on PCI
        help
          Support the K8 IOMMU. Needed to run systems with more than 4GB of memory
          properly with 32-bit PCI devices that do not support DAC (Double Address
@@ -340,16 +329,6 @@ config X86_MCE
 
 endmenu
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-       bool
-       default y
-
-config GENERIC_IRQ_PROBE
-       bool
-       default y
 
 menu "Power management options"