diff --git a/[refs] b/[refs]
index e3b51b677420..7140466e05db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a6e28b5096aea6801a21bdc20bf1de32833af5
+refs/heads/master: 22a5c27bec0161c70cc2d8d1730f9b14b604757d
diff --git a/trunk/drivers/edac/Kconfig b/trunk/drivers/edac/Kconfig
index 203361e4ef94..fdffa1beca17 100644
--- a/trunk/drivers/edac/Kconfig
+++ b/trunk/drivers/edac/Kconfig
@@ -214,8 +214,8 @@ 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
+	depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL
+	depends on PCI_MMCONFIG && EXPERIMENTAL
 	help
 	  Support for error detection and correction the Intel
 	  Sandy Bridge Integrated Memory Controller.