diff --git a/[refs] b/[refs] index 660874eb7e99..2fdf11948e46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6e13b528f5a6c6a6ae260007d4fd14c3dbc5648 +refs/heads/master: 124a02c9b44a5faa3373a92388aa00290a76a0b7 diff --git a/trunk/drivers/edac/Kconfig b/trunk/drivers/edac/Kconfig index 15e453577213..203361e4ef94 100644 --- a/trunk/drivers/edac/Kconfig +++ b/trunk/drivers/edac/Kconfig @@ -215,6 +215,7 @@ config EDAC_I7300 config EDAC_SBRIDGE tristate "Intel Sandy-Bridge Integrated MC" depends on EDAC_MM_EDAC && PCI && X86 && X86_MCE_INTEL + depends on EXPERIMENTAL help Support for error detection and correction the Intel Sandy Bridge Integrated Memory Controller.