1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 672b92ef9f21..e7d56573fe56 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -36,7 +36,7 @@ config IEEE1394_VERBOSEDEBUG
           else says N.
 
 config IEEE1394_OUI_DB
-        bool "OUI Database built-in"
+        bool "OUI Database built-in (deprecated)"
         depends on IEEE1394
         help
           If you say Y here, then an OUI list (vendor unique ID's) will be
@@ -67,16 +67,11 @@ config IEEE1394_CONFIG_ROM_IP1394
           eth1394 option below.
 
 config IEEE1394_EXPORT_FULL_API
-        bool "Export all symbols of ieee1394's API"
+        bool "Export all symbols of ieee1394's API (deprecated)"
         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.
+          This option will be removed soon.  Don't worry, say N.
 
 comment "Device Drivers"
         depends on IEEE1394
@@ -125,7 +120,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
@@ -161,17 +156,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"