netns xfrm: fix "ip xfrm state|policy count" misreport

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

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index fa6d6ab..a9371b3 100644 (file)
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,29 +1,25 @@
-comment "A new alternative FireWire stack is available with EXPERIMENTAL=y"
-       depends on EXPERIMENTAL=n
+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 "Enable only one of the two stacks, unless you know what you are doing"
-       depends on EXPERIMENTAL
+comment "You can enable one or both FireWire driver stacks."
+comment "The newer stack is recommended."
 
 config FIREWIRE
-       tristate "New FireWire stack, EXPERIMENTAL"
-       depends on EXPERIMENTAL
+       tristate "FireWire driver stack"
        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 old stack (the ieee1394 driver, ohci1394 etc.) or both.
-         Please read http://wiki.linux1394.org/JujuMigration before you
-         enable the new stack.
+         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 firewire-core.
 
-         This module functionally replaces ieee1394, raw1394, and video1394.
-         To access it from application programs, you generally need at least
-         libraw1394 version 2.  IIDC/DCAM applications also need libdc1394
-         version 2.  No libraries are required to access storage devices
-         through the firewire-sbp2 driver.
-
 config FIREWIRE_OHCI
        tristate "OHCI-1394 controllers"
        depends on PCI && FIREWIRE
@@ -33,29 +29,7 @@ config FIREWIRE_OHCI
          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.
-
-         NOTE:
-
-         You should only build either firewire-ohci or the old ohci1394 driver,
-         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.
+         called firewire-ohci.
 
 config FIREWIRE_OHCI_DEBUG
        bool
@@ -72,8 +46,24 @@ config FIREWIRE_SBP2
          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.
+         called firewire-sbp2.
 
          You should also enable support for disks, CD-ROMs, etc. in the SCSI
          configuration section.
+
+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