diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/net/Kconfig | |
parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/net/Kconfig')
-rw-r--r-- | drivers/usb/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig index 8c010bb44eb8..efd6ca7e4ac5 100644 --- a/drivers/usb/net/Kconfig +++ b/drivers/usb/net/Kconfig | |||
@@ -294,7 +294,7 @@ config USB_NET_ZAURUS | |||
294 | This also supports some related device firmware, as used in some | 294 | This also supports some related device firmware, as used in some |
295 | PDAs from Olympus and some cell phones from Motorola. | 295 | PDAs from Olympus and some cell phones from Motorola. |
296 | 296 | ||
297 | If you install an alternate ROM image, such as the Linux 2.6 based | 297 | If you install an alternate image, such as the Linux 2.6 based |
298 | versions of OpenZaurus, you should no longer need to support this | 298 | versions of OpenZaurus, you should no longer need to support this |
299 | protocol. Only the "eth-fd" or "net_fd" drivers in these devices | 299 | protocol. Only the "eth-fd" or "net_fd" drivers in these devices |
300 | really need this non-conformant variant of CDC Ethernet (or in | 300 | really need this non-conformant variant of CDC Ethernet (or in |