2 files changed, 30 insertions, 41 deletions

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index d6b1721e52ab..13efcd362072 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,28 +1,29 @@
-comment "A new alternative FireWire stack is available with EXPERIMENTAL=y"
-        depends on EXPERIMENTAL=n
-
-comment "Enable only one of the two stacks, unless you know what you are doing"
-        depends on EXPERIMENTAL
+comment "You can enable one or both FireWire driver stacks."
+comment "See the help texts for more information."
 
 config FIREWIRE
-        tristate "New FireWire stack, EXPERIMENTAL"
-        depends on EXPERIMENTAL
+        tristate "FireWire driver stack"
         select CRC_ITU_T
         help
-          This is the "Juju" FireWire stack, a new alternative implementation
-          designed for robustness and simplicity.  You can build either this
-          stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both.
-          Please read http://ieee1394.wiki.kernel.org/index.php/Juju_Migration
-          before you enable the new stack.
+          This is the new-generation IEEE 1394 (FireWire) driver stack
+          a.k.a. Juju, a new implementation designed for robustness and
+          simplicity.
+          See http://ieee1394.wiki.kernel.org/index.php/Juju_Migration
+          for information about migration from the older Linux 1394 stack
+          to the new driver stack.
 
           To compile this driver as a module, say M here: the module will be
           called firewire-core.
 
           This module functionally replaces ieee1394, raw1394, and video1394.
           To access it from application programs, you generally need at least
-          libraw1394 version 2.  IIDC/DCAM applications also need libdc1394
-          version 2.  No libraries are required to access storage devices
-          through the firewire-sbp2 driver.
+          libraw1394 v2.  IIDC/DCAM applications need libdc1394 v2.
+          No libraries are required to access storage devices through the
+          firewire-sbp2 driver.
+
+          NOTE:
+          FireWire audio devices currently require the old drivers (ieee1394,
+          ohci1394, raw1394).
 
 config FIREWIRE_OHCI
         tristate "OHCI-1394 controllers"
@@ -37,11 +38,9 @@ config FIREWIRE_OHCI
           stack.
 
           NOTE:
-
-          You should only build either firewire-ohci or the old ohci1394 driver,
-          but not both.  If you nevertheless want to install both, you should
-          configure them only as modules and blacklist the driver(s) which you
-          don't want to have auto-loaded.  Add either
+          If you want to install firewire-ohci and ohci1394 together, you
+          should configure them only as modules and blacklist the driver(s)
+          which you don't want to have auto-loaded.  Add either
 
               blacklist firewire-ohci
           or
@@ -50,12 +49,7 @@ config FIREWIRE_OHCI
               blacklist dv1394
 
           to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf
-          depending on your distribution.  The latter two modules should be
-          blacklisted together with ohci1394 because they depend on ohci1394.
-
-          If you have an old modprobe which doesn't implement the blacklist
-          directive, use "install modulename /bin/true" for the modules to be
-          blacklisted.
+          depending on your distribution.
 
 config FIREWIRE_OHCI_DEBUG
         bool
@@ -79,13 +73,15 @@ config FIREWIRE_SBP2
           configuration section.
 
 config FIREWIRE_NET
-        tristate "IP networking over 1394"
-        depends on FIREWIRE && INET
+        tristate "IP networking over 1394 (EXPERIMENTAL)"
+        depends on FIREWIRE && INET && EXPERIMENTAL
         help
           This enables IPv4 over IEEE 1394, providing IP connectivity with
           other implementations of RFC 2734 as found on several operating
           systems.  Multicast support is currently limited.
 
+          NOTE, this driver is not stable yet!
+
           To compile this driver as a module, say M here:  The module will be
           called firewire-net.  It replaces eth1394 of the classic IEEE 1394
           stack.
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 584245881f4a..f102fcc7e52a 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support"
 source "drivers/firewire/Kconfig"
 
 config IEEE1394
-        tristate "Stable FireWire stack"
+        tristate "Legacy alternative FireWire driver stack"
         depends on PCI || BROKEN
         help
           IEEE 1394 describes a high performance serial bus, which is also
@@ -33,11 +33,9 @@ config IEEE1394_OHCI1394
           module will be called ohci1394.
 
           NOTE:
-
-          You should only build either ohci1394 or the new firewire-ohci driver,
-          but not both.  If you nevertheless want to install both, you should
-          configure them only as modules and blacklist the driver(s) which you
-          don't want to have auto-loaded.  Add either
+          If you want to install firewire-ohci and ohci1394 together, you
+          should configure them only as modules and blacklist the driver(s)
+          which you don't want to have auto-loaded.  Add either
 
               blacklist firewire-ohci
           or
@@ -46,12 +44,7 @@ config IEEE1394_OHCI1394
               blacklist dv1394
 
           to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf
-          depending on your distribution.  The latter two modules should be
-          blacklisted together with ohci1394 because they depend on ohci1394.
-
-          If you have an old modprobe which doesn't implement the blacklist
-          directive, use "install modulename /bin/true" for the modules to be
-          blacklisted.
+          depending on your distribution.
 
 comment "PCILynx controller requires I2C"
         depends on IEEE1394 && I2C=n
@@ -105,7 +98,7 @@ config IEEE1394_ETH1394_ROM_ENTRY
         default n
 
 config IEEE1394_ETH1394
-        tristate "IP networking over 1394"
+        tristate "IP networking over 1394 (experimental)"
         depends on IEEE1394 && EXPERIMENTAL && INET
         select IEEE1394_ETH1394_ROM_ENTRY
         help