Merge ../linus

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

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 7d58af1ae306f2574c5217a2b4477f9ef1e378f0..186737539cf5f4fe32fac373fe982724bd5ac7ec 100644 (file)
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -66,6 +66,18 @@ config IEEE1394_CONFIG_ROM_IP1394
          with MacOSX and WinXP IP-over-1394), enable this option and the
          eth1394 option below.
 
+config IEEE1394_EXPORT_FULL_API
+       bool "Export all symbols of ieee1394's API"
+       depends on IEEE1394
+       default n
+       help
+         Export all symbols of ieee1394's driver programming interface, even
+         those that are not currently used by the standard IEEE 1394 drivers.
+
+         This option does not affect the interface to userspace applications.
+         Say Y here if you want to compile externally developed drivers that
+         make extended use of ieee1394's API. It is otherwise safe to say N.
+
 comment "Device Drivers"
        depends on IEEE1394
 
@@ -116,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"
@@ -157,27 +178,4 @@ config IEEE1394_RAWIO
          To compile this driver as a module, say M here: the
          module will be called raw1394.
 
-config IEEE1394_CMP
-       tristate "IEC61883-1 Plug support"
-       depends on IEEE1394
-       help
-         This option enables the Connection Management Procedures
-         (IEC61883-1) driver, which implements input and output plugs.
-
-         To compile this driver as a module, say M here: the
-         module will be called cmp.
-
-config IEEE1394_AMDTP
-       tristate "IEC61883-6 (Audio transmission) support"
-       depends on IEEE1394 && IEEE1394_OHCI1394 && IEEE1394_CMP
-       help
-         This option enables the Audio & Music Data Transmission Protocol
-         (IEC61883-6) driver, which implements audio transmission over
-         IEEE1394.
-
-         The userspace interface is documented in amdtp.h.
-
-         To compile this driver as a module, say M here: the
-         module will be called amdtp.
-
 endmenu