Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[powerpc.git] / drivers / usb / net / Kconfig

diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index efd6ca7..454a186 100644 (file)
--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
@@ -207,6 +207,14 @@ config USB_NET_PLUSB
          Choose this option if you're using a host-to-host cable
          with one of these chips.
 
+config USB_NET_MCS7830
+       tristate "MosChip MCS7830 based Ethernet adapters"
+       depends on USB_USBNET
+       help
+         Choose this option if you're using a 10/100 Ethernet USB2
+         adapter based on the MosChip 7830 controller. This includes
+         adapters marketed under the DeLOCK brand.
+
 config USB_NET_RNDIS_HOST
        tristate "Host for RNDIS devices (EXPERIMENTAL)"
        depends on USB_USBNET && EXPERIMENTAL
@@ -301,21 +309,4 @@ config USB_NET_ZAURUS
          some cases CDC MDLM) protocol, not "g_ether".
 
 
-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