firewire: core: fix an information leak

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

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 5c46e25..a9371b3 100644 (file)
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,47 +1,44 @@
-# -*- shell-script -*-
+menu "IEEE 1394 (FireWire) support"
+       depends on PCI || BROKEN
+       # firewire-core does not depend on PCI but is
+       # not useful without PCI controller driver
 
-comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
-       depends on EXPERIMENTAL=n
+comment "You can enable one or both FireWire driver stacks."
+comment "The newer stack is recommended."
 
-config FW
-       tristate "IEEE 1394 (FireWire) support (JUJU alternative stack, experimental)"
-       depends on EXPERIMENTAL
+config FIREWIRE
+       tristate "FireWire driver stack"
+       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.
-
-         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.
+         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 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.
+         called firewire-core.
 
-config FW_OHCI
-       tristate "Support for OHCI FireWire host controllers"
-       depends on PCI && FW
+config FIREWIRE_OHCI
+       tristate "OHCI-1394 controllers"
+       depends on PCI && FIREWIRE
        help
          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.
+         called firewire-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 FIREWIRE_OHCI_DEBUG
+       bool
+       depends on FIREWIRE_OHCI
+       default y
 
-config FW_SBP2
-       tristate "Support for storage devices (SBP-2 protocol driver)"
-       depends on FW && SCSI
+config FIREWIRE_SBP2
+       tristate "Storage devices (SBP-2 protocol)"
+       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
@@ -49,12 +46,24 @@ config FW_SBP2
          like scanners.
 
          To compile this driver as a module, say M here:  The module will be
-         called fw-sbp2.
+         called firewire-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.
+config FIREWIRE_NET
+       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.
+
+source "drivers/ieee1394/Kconfig"
 
+endmenu