Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[safe/jmp/linux-2.6] / drivers / firewire / Kconfig

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index bdd6303..25bdc2d 100644 (file)
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,23 +1,71 @@
-# -*- shell-script -*-
+comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
+       depends on EXPERIMENTAL=n
 
-menu "IEEE 1394 (FireWire) support (JUJU alternative stack)"
+config FIREWIRE
+       tristate "IEEE 1394 (FireWire) support - alternative stack, EXPERIMENTAL"
+       depends on EXPERIMENTAL
+       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 classic stack (the ieee1394 driver, ohci1394 etc.)
+         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,
+         and video1394.
+
+          NOTE:
 
-config FW
-       tristate "IEEE 1394 (FireWire) support (JUJU alternative stack)"
+         You should only build ONE of the stacks, unless you REALLY know what
+         you are doing.
+
+config FIREWIRE_OHCI
+       tristate "Support for OHCI FireWire host controllers"
+       depends on PCI && FIREWIRE
        help
-         IEEE 1394 describes a high performance serial bus, which is also
-         known as FireWire(tm) or i.Link(tm) and is used for connecting all
-         sorts of devices (most notably digital video cameras) to your
-         computer.
+         Enable this driver if you have a FireWire controller based
+         on the OHCI specification.  For all practical purposes, this
+         is the only chipset in use, so say Y here.
+
+         To compile this driver as a module, say M here:  The module will be
+         called firewire-ohci.  It replaces ohci1394 of the classic IEEE 1394
+         stack.
 
-         If you have FireWire hardware and want to use it, say Y here.  This
-         is the core support only, you will also need to select a driver for
-         your IEEE 1394 adapter.
+          NOTE:
 
-         This is the "JUJU" firewire stack, an alternative
-         implementation designed for roboustness and simplicity.
+         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)"
+       depends on FIREWIRE && SCSI
+       help
+         This option enables you to use SBP-2 devices connected to a
+         FireWire bus.  SBP-2 devices include storage devices like
+         harddisks and DVD drives, also some other FireWire devices
+         like scanners.
 
-         To compile this driver as a module, say M here: the
-         module will be called fw-core.
+         To compile this driver as a module, say M here:  The module will be
+         called firewire-sbp2.  It replaces sbp2 of the classic IEEE 1394
+         stack.
 
-endmenu
+         You should also enable support for disks, CD-ROMs, etc. in the SCSI
+         configuration section.