diff --git a/[refs] b/[refs]
index c6bd291c4541..75f336b4a716 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40e7babbb52b4b57721b9175aed7a14d93bf242f
+refs/heads/master: 116a9fb3ed98c19d1ee0c6c55971f5b753949393
diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug
index 5236621350bc..ae36bfa814e5 100644
--- a/trunk/arch/x86/Kconfig.debug
+++ b/trunk/arch/x86/Kconfig.debug
@@ -179,7 +179,6 @@ config MMIOTRACE
 	depends on DEBUG_KERNEL && PCI
 	select TRACING
 	select MMIOTRACE_HOOKS
-	default y
 	help
 	  Mmiotrace traces Memory Mapped I/O access and is meant for
 	  debugging and reverse engineering. It is called from the ioremap