FRV: Add support for emulation of userspace atomic ops [try #2]

[linux-2.6-omap-h63xx.git] / drivers / firewire / Kconfig

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index d011a76f8e7a4d032820ffbaafd7d0c544e1a259..25bdc2dd9ce10cf5cb8bfe2fd19ac130c27cdb33 100644 (file)
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,5 +1,3 @@
-# -*- shell-script -*-
-
 comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
        depends on EXPERIMENTAL=n
 
@@ -11,7 +9,8 @@ config FIREWIRE
          This is the "Juju" FireWire stack, a new alternative implementation
          designed for robustness and simplicity.  You can build either this
          stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
-         or both.
+         or both.  Please read http://wiki.linux1394.org/JujuMigration before
+         you enable the new stack.
 
          To compile this driver as a module, say M here: the module will be
          called firewire-core.  It functionally replaces ieee1394, raw1394,
@@ -20,27 +19,7 @@ config FIREWIRE
           NOTE:
 
          You should only build ONE of the stacks, unless you REALLY know what
-         you are doing.  If you install both, you should configure them only as
-         modules rather than link them statically, and you should blacklist one
-         of the concurrent low-level drivers in /etc/modprobe.conf.  Add either
-
-             blacklist firewire-ohci
-         or
-             blacklist ohci1394
-
-         there depending on which driver you DON'T want to have auto-loaded.
-         You can optionally do the same with the other IEEE 1394/ FireWire
-         drivers.
-
-         If you have an old modprobe which doesn't implement the blacklist
-         directive, use either
-
-              install firewire-ohci /bin/true
-         or
-              install ohci1394 /bin/true
-
-         and so on, depending on which modules you DON't want to have
-         auto-loaded.
+         you are doing.
 
 config FIREWIRE_OHCI
        tristate "Support for OHCI FireWire host controllers"
@@ -56,8 +35,24 @@ config FIREWIRE_OHCI
 
           NOTE:
 
-         If you also build ohci1394 of the classic stack, blacklist either
-         ohci1394 or firewire-ohci to let hotplug load only the desired driver.
+         You should only build ohci1394 or firewire-ohci, 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
+
+             blacklist firewire-ohci
+         or
+             blacklist ohci1394
+             blacklist video1394
+             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.
 
 config FIREWIRE_SBP2
        tristate "Support for storage devices (SBP-2 protocol driver)"
@@ -74,9 +69,3 @@ config FIREWIRE_SBP2
 
          You should also enable support for disks, CD-ROMs, etc. in the SCSI
          configuration section.
-
-          NOTE:
-
-         If you also build sbp2 of the classic stack, blacklist either sbp2
-         or firewire-sbp2 to let hotplug load only the desired driver.
-