1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 048d52e69d15..5c46e257bc9c 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -16,11 +16,13 @@ config FW
           is the core support only, you will also need to select a driver for
           your IEEE 1394 adapter.
 
-          This is the "JUJU" FireWire stack, an alternative
-          implementation designed for robustness and simplicity.
+          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 fw-core.
+          This is the "JUJU" FireWire stack, an alternative implementation
+          designed for robustness and simplicity.  You can build either this
+          stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
+          or both.
 
 config FW_OHCI
         tristate "Support for OHCI FireWire host controllers"
@@ -30,8 +32,12 @@ config FW_OHCI
           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 fw-ohci.
+
+          If you also build ohci1394 of the classic IEEE 1394 driver stack,
+          blacklist either ohci1394 or fw-ohci to let hotplug load the desired
+          driver.
 
 config FW_SBP2
         tristate "Support for storage devices (SBP-2 protocol driver)"
@@ -42,6 +48,13 @@ config FW_SBP2
           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-sbp2.
+
           You should also enable support for disks, CD-ROMs, etc. in the SCSI
           configuration section.
 
+          If you also build sbp2 of the classic IEEE 1394 driver stack,
+          blacklist either sbp2 or fw-sbp2 to let hotplug load the desired
+          driver.
+