Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index b582d0cdc24f3becf182629eb6eaec1798ed3ae0..debf1d8e8b417ba6e2f92df7f64f376ffc299bd7 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -6,10 +6,9 @@
 # $Id: Kconfig,v 1.4.2.7 2005/07/08 22:05:38 dsp_llnl Exp $
 #
 
-menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)'
-
-config EDAC
-       tristate "EDAC core system error reporting (EXPERIMENTAL)"
+menuconfig EDAC
+       tristate "EDAC - error detection and reporting (EXPERIMENTAL)"
+       depends on HAS_IOMEM
        depends on X86 && EXPERIMENTAL
        help
          EDAC is designed to report errors in the core system.
@@ -29,13 +28,12 @@ config EDAC
          There is also a mailing list for the EDAC project, which can
          be found via the sourceforge page.
 
+if EDAC
 
 comment "Reporting subsystems"
-       depends on EDAC
 
 config EDAC_DEBUG
        bool "Debugging"
-       depends on EDAC
        help
          This turns on debugging information for the entire EDAC
          sub-system. You can insert module with "debug_level=x", current
@@ -44,7 +42,6 @@ config EDAC_DEBUG
 
 config EDAC_MM_EDAC
        tristate "Main Memory EDAC (Error Detection And Correction) reporting"
-       depends on EDAC
        default y
        help
          Some systems are able to detect and correct errors in main
@@ -71,7 +68,7 @@ config EDAC_E7XXX
 
 config EDAC_E752X
        tristate "Intel e752x (e7520, e7525, e7320)"
-       depends on EDAC_MM_EDAC && PCI && X86
+       depends on EDAC_MM_EDAC && PCI && X86 && HOTPLUG
        help
          Support for error detection and correction on the Intel
          E7520, E7525, E7320 server chipsets.
@@ -99,15 +96,13 @@ config EDAC_R82600
 
 choice
        prompt "Error detecting method"
-       depends on EDAC
        default EDAC_POLL
 
 config EDAC_POLL
        bool "Poll for errors"
-       depends on EDAC
        help
          Poll the chipset periodically to detect errors.
 
 endchoice
 
-endmenu
+endif # EDAC