Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 7e38e5e..e443f2c 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -181,7 +181,7 @@ config EDAC_I3000
 
 config EDAC_I3200
        tristate "Intel 3200"
 
 config EDAC_I3200
        tristate "Intel 3200"

-       depends on EDAC_MM_EDAC && PCI && X86 && EXPERIMENTAL
+       depends on EDAC_MM_EDAC && PCI && X86

        help
          Support for error detection and correction on the Intel
          3200 and 3210 server chipsets.
        help
          Support for error detection and correction on the Intel
          3200 and 3210 server chipsets.


@@ -247,7 +247,7 @@ config EDAC_I7300
 config EDAC_SBRIDGE
        tristate "Intel Sandy-Bridge Integrated MC"
        depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL
 config EDAC_SBRIDGE
        tristate "Intel Sandy-Bridge Integrated MC"
        depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL

-       depends on PCI_MMCONFIG && EXPERIMENTAL
+       depends on PCI_MMCONFIG

        help
          Support for error detection and correction the Intel
          Sandy Bridge Integrated Memory Controller.
        help
          Support for error detection and correction the Intel
          Sandy Bridge Integrated Memory Controller.