X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Ffirewire%2FKconfig;h=fe9e768cfbc4d28aa462d73fb60d79b689d160e9;hb=1b9c12ba2fdf802a23630f70eddb0e821296634e;hp=bfab4b32cdce13b60dc263a58a026e0ba0633974;hpb=9ba136d0fe5a3dd33533b4a2a21156aa22f80ebe;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index bfab4b32cdc..fe9e768cfbc 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,46 +1,83 @@
 # -*- shell-script -*-
 
-menu "IEEE 1394 (FireWire) support (JUJU alternative stack)"
+comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
+	depends on EXPERIMENTAL=n
 
-config FW
-	tristate "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
-	  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.
+	  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.
 
-	  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.
+	  To compile this driver as a module, say M here: the module will be
+	  called firewire-core.  It functionally replaces ieee1394, raw1394,
+	  and video1394.
 
-	  This is the "JUJU" firewire stack, an alternative
-	  implementation designed for roboustness and simplicity.
+          NOTE:
 
-	  To compile this driver as a module, say M here: the
-	  module will be called fw-core.
+	  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
 
-config FW_OHCI
-	tristate "Support for OHCI firewire host controllers"
-	depends on PCI && FW
+	      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.
+
+config FIREWIRE_OHCI
+	tristate "Support for OHCI FireWire host controllers"
+	depends on PCI && FIREWIRE
 	help
-	  Enable this driver if you have an firewire controller based
+	  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 fw-ohci.
+	  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.
 
-config FW_SBP2
+          NOTE:
+
+	  If you also build ohci1394 of the classic stack, blacklist either
+	  ohci1394 or firewire-ohci to let hotplug load only the desired driver.
+
+config FIREWIRE_SBP2
 	tristate "Support for storage devices (SBP-2 protocol driver)"
-	depends on FW && SCSI
+	depends on FIREWIRE && SCSI
 	help
-	  This option enables you to use SBP-2 devices connected to an
-	  firewire bus.  SBP-2 devices include storage devices like
+	  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 firewire-sbp2.  It replaces sbp2 of the classic IEEE 1394
+	  stack.
+
 	  You should also enable support for disks, CD-ROMs, etc. in the SCSI
 	  configuration section.
 
-endmenu
+          NOTE:
+
+	  If you also build sbp2 of the classic stack, blacklist either sbp2
+	  or firewire-sbp2 to let hotplug load only the desired driver.
+