Merge branch 'linus' into core/generic-dma-coherent

[linux-2.6] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 5236621350bc9169d2be181e3de37d56c1a4a08b..ae36bfa814e5b389d706b9cc3fa1d879f16abe8b 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/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