Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / ieee1394 / Kconfig

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 2769e505f051530cb676cf60df41b59a34161ceb..b8a47342cd2ca33c08ccf20180e66f44c754d331 100644 (file)
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -35,20 +35,6 @@ config IEEE1394_VERBOSEDEBUG
          Say Y if you really want or need the debugging output, everyone
          else says N.
 
-config IEEE1394_OUI_DB
-       bool "OUI Database built-in"
-       depends on IEEE1394
-       help
-         If you say Y here, then an OUI list (vendor unique ID's) will be
-         compiled into the ieee1394 module. This doesn't really do much
-         except being able to display the vendor of a hardware node. The
-         downside is that it adds about 300k to the size of the module,
-         or kernel (depending on whether you compile ieee1394 as a
-         module, or static in the kernel).
-
-         This option is not needed for userspace programs like gscanbus
-         to show this information.
-
 config IEEE1394_EXTRA_CONFIG_ROMS
        bool "Build in extra config rom entries for certain functionality"
        depends on IEEE1394
@@ -66,18 +52,6 @@ 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
 
@@ -125,7 +99,7 @@ comment "SBP-2 support (for storage devices) requires SCSI"
 
 config IEEE1394_SBP2
        tristate "SBP-2 support (Harddisks etc.)"
-       depends on IEEE1394 && SCSI && (PCI || BROKEN)
+       depends on IEEE1394 && SCSI
        help
          This option enables you to use SBP-2 devices connected to an IEEE
          1394 bus.  SBP-2 devices include storage devices like harddisks and
@@ -140,7 +114,7 @@ config IEEE1394_SBP2_PHYS_DMA
        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'
+         Physical DMA is data movement without assistance of the drivers'
          interrupt handlers.  This option includes the interrupt handlers
          that are required in absence of this hardware feature.
 
@@ -161,17 +135,12 @@ config IEEE1394_ETH1394
          MCAP, therefore multicast support is significantly limited.
 
 config IEEE1394_DV1394
-       tristate "OHCI-DV I/O support"
+       tristate "OHCI-DV I/O support (deprecated)"
        depends on IEEE1394 && IEEE1394_OHCI1394
        help
-         This driver allows you to transmit and receive DV (digital video)
-         streams on an OHCI-1394 card using a simple frame-oriented
-         interface.
-
-         The user-space API for dv1394 is documented in dv1394.h.
-
-         To compile this driver as a module, say M here: the
-         module will be called dv1394.
+         The dv1394 driver will be removed from Linux in a future release.
+         Its functionality is now provided by raw1394 together with libraries
+         such as libiec61883.
 
 config IEEE1394_RAWIO
        tristate "Raw IEEE1394 I/O support"