Merge ../linus

[sfrench/cifs-2.6.git] / drivers / ieee1394 / Kconfig

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 39142e2f804b2433010f512492df8c5e2aa2f116..186737539cf5f4fe32fac373fe982724bd5ac7ec 100644 (file)
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -128,8 +128,17 @@ config IEEE1394_SBP2
          1394 bus.  SBP-2 devices include harddrives and DVD devices.
 
 config IEEE1394_SBP2_PHYS_DMA
-       bool "Enable Phys DMA support for SBP2 (Debug)"
-       depends on IEEE1394 && IEEE1394_SBP2
+       bool "Enable replacement for physical DMA in SBP2"
+       depends on IEEE1394 && IEEE1394_SBP2 && EXPERIMENTAL && (X86_32 || PPC_32)
+       help
+         This builds sbp2 for use with non-OHCI host adapters which do not
+         support physical DMA or for when ohci1394 is run with phys_dma=0.
+         Physical DMA is data movement without assistence of the drivers'
+         interrupt handlers.  This option includes the interrupt handlers
+         that are required in absence of this hardware feature.
+
+         This option is buggy and currently broken on some architectures.
+         If unsure, say N.
 
 config IEEE1394_ETH1394
        tristate "Ethernet over 1394"