vserver 2.0 rc7

[linux-2.6.git] / drivers / usb / net / Kconfig

diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index d64409e..b104430 100644 (file)
--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
@@ -219,17 +219,21 @@ config USB_EPSON2888
          by some sample firmware from Epson.
 
 config USB_ZAURUS
-       boolean "Sharp Zaurus (stock ROMs)"
+       boolean "Sharp Zaurus (stock ROMs) and compatible"
        depends on USB_USBNET
        select CRC32
        default y
        help
          Choose this option to support the usb networking links used by
          Zaurus models like the SL-5000D, SL-5500, SL-5600, A-300, B-500.
+         This also supports some related device firmware, as used in some
+         PDAs from Olympus and some cell phones from Motorola.
 
-         If you install an alternate ROM image, you may no longer need
-         to support this protocol.  Only the "eth-fd" driver really needs
-         this non-conformant variant of CDC Ethernet protocol.
+         If you install an alternate ROM image, such as the Linux 2.6 based
+         versions of OpenZaurus, you should no longer need to support this
+         protocol.  Only the "eth-fd" or "net_fd" drivers in these devices
+         really need this non-conformant variant of CDC Ethernet (or in
+         some cases CDC MDLM) protocol, not "g_ether".
 
 config USB_CDCETHER
        boolean "CDC Ethernet support (smart devices such as cable modems)"
@@ -260,13 +264,13 @@ comment "USB Network Adapters"
        depends on USB_USBNET
 
 config USB_AX8817X
-       boolean "ASIX AX88172 Based USB 2.0 Ethernet Devices"
+       boolean "ASIX AX88xxx Based USB 2.0 Ethernet Devices"
        depends on USB_USBNET && NET_ETHERNET
        select CRC32
        select MII
        default y
        help
-         This option adds support for ASIX AX88172 based USB 2.0
+         This option adds support for ASIX AX88xxx based USB 2.0
          10/100 Ethernet devices.
 
          This driver should work with at least the following devices:
@@ -287,4 +291,21 @@ config USB_AX8817X
          This driver creates an interface named "ethX", where X depends on
          what other networking devices you have in use.  
 
+config USB_ZD1201
+       tristate "USB ZD1201 based Wireless device support"
+       depends on NET_RADIO
+       select FW_LOADER
+       ---help---
+         Say Y if you want to use wireless LAN adapters based on the ZyDAS
+         ZD1201 chip.
+
+         This driver makes the adapter appear as a normal Ethernet interface,
+         typically on wlan0.
+         
+         The zd1201 device requires external firmware to be loaded.
+         This can be found at http://linux-lc100020.sourceforge.net/
+         
+         To compile this driver as a module, choose M here: the
+         module will be called zd1201.
+
 endmenu