aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/net/Kconfig
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-05-10 06:45:10 -0700
committerGreg KH <gregkh@suse.de>2005-05-16 21:44:25 -0700
commit80615f81534109a22a732d0328d63ced4432824e (patch)
treedddfa2683508d40eb965841169d0ac21435c2cf2 /drivers/usb/net/Kconfig
parentAutomatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git (diff)
downloadlinux-dev-80615f81534109a22a732d0328d63ced4432824e.tar.xz
linux-dev-80615f81534109a22a732d0328d63ced4432824e.zip
[PATCH] USB: usbnet driver fixes
Updates to the usbnet driver: - Remove a warning when built with Zaurus support but not CDC Ethernet; just moves an #ifdef to cover more code - Two tweaks to the pseudo-MDLM support: * correctly handle _either_ of the two GUIDs * ignore a padding bit that doesn't seem necessary - Remove ID for one Motorola phone that uses the MDLM stuff. It also updates the Kconfig helptext to make it clearer that the "Zaurus" configuration option supports an increasing (sigh) family of nonstandard peripheral protocols. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/net/Kconfig')
-rw-r--r--drivers/usb/net/Kconfig14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index db64c908d4a7..b104430e2c6a 100644
--- 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.
-
- 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.
+ 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, 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)"