usb ethernet gadget, workaround network stack API glitch

[linux-2.6] / drivers / ieee1394 / Kconfig

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 3cb8b422b3bdcfd7ea1d241a9b9c3035d3423ae9..cd84a55ecf2020dfad052d88bfe9fabdad20a9ad 100644 (file)
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -35,20 +35,6 @@ config IEEE1394_VERBOSEDEBUG
          Say Y if you really want or need the debugging output, everyone
          else says N.
 
-config IEEE1394_OUI_DB
-       bool "OUI Database built-in (deprecated)"
-       depends on IEEE1394
-       help
-         If you say Y here, then an OUI list (vendor unique ID's) will be
-         compiled into the ieee1394 module. This doesn't really do much
-         except being able to display the vendor of a hardware node. The
-         downside is that it adds about 300k to the size of the module,
-         or kernel (depending on whether you compile ieee1394 as a
-         module, or static in the kernel).
-
-         This option is not needed for userspace programs like gscanbus
-         to show this information.
-
 config IEEE1394_EXTRA_CONFIG_ROMS
        bool "Build in extra config rom entries for certain functionality"
        depends on IEEE1394
@@ -152,9 +138,9 @@ config IEEE1394_DV1394
        tristate "OHCI-DV I/O support (deprecated)"
        depends on IEEE1394 && IEEE1394_OHCI1394
        help
-         The dv1394 driver will be removed from Linux in a future release.
-         Its functionality is now provided by raw1394 together with libraries
-         such as libiec61883.
+         The dv1394 driver is unsupported and may be removed from Linux in a
+         future release.  Its functionality is now provided by raw1394 together
+         with libraries such as libiec61883.
 
 config IEEE1394_RAWIO
        tristate "Raw IEEE1394 I/O support"