Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index aaba784332e0cd158a67fa402b8615859d64a249..95de3102bc87c61afe3289b117ffc16099a8df16 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -583,7 +583,7 @@ config LATENCYTOP
          to find out which userspace is blocking on what kernel operations.
 
 config PROVIDE_OHCI1394_DMA_INIT
-       bool "Provide code for enabling DMA over FireWire early on boot"
+       bool "Remote debugging over FireWire early on boot"
        depends on PCI && X86
        help
          If you want to debug problems which hang or crash the kernel early
@@ -611,6 +611,17 @@ config PROVIDE_OHCI1394_DMA_INIT
 
          See Documentation/debugging-via-ohci1394.txt for more information.
 
+config FIREWIRE_OHCI_REMOTE_DMA
+       bool "Remote debugging over FireWire with firewire-ohci"
+       depends on FIREWIRE_OHCI
+       help
+         This option lets you use the FireWire bus for remote debugging
+         with help of the firewire-ohci driver. It enables unfiltered
+         remote DMA in firewire-ohci.
+         See Documentation/debugging-via-ohci1394.txt for more information.
+
+         If unsure, say N.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"