diff --git a/[refs] b/[refs]
index d997e2f4ce00..c1f79fe236b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28eb559b5b0b9b51b9165a9b8faa75b0bb91ca8d
+refs/heads/master: 1f56cf1c58c81f7ecf16f5e99ac4a333d9dc9aea
diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug
index 0c1890c41279..239fd9fba0a5 100644
--- a/trunk/arch/x86/Kconfig.debug
+++ b/trunk/arch/x86/Kconfig.debug
@@ -7,7 +7,6 @@ source "lib/Kconfig.debug"
 
 config NONPROMISC_DEVMEM
 	bool "Disable promiscuous /dev/mem"
-	default y
 	help
 	  The /dev/mem file by default only allows userspace access to PCI
 	  space and the BIOS code and data regions. This is sufficient for