diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 11:48:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 11:48:30 +0200 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /drivers/net/usb/Kconfig | |
| parent | smsc911x: fix calculation of res_size for ioremap (diff) | |
| parent | net: remove stale reference to fastroute from Kconfig help text (diff) | |
| download | linux-22f6dacdfcfdc792d068e9c41234808860498d04.tar.xz linux-22f6dacdfcfdc792d068e9c41234808860498d04.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/net/tcp.h
Diffstat (limited to 'drivers/net/usb/Kconfig')
| -rw-r--r-- | drivers/net/usb/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index e00b5b1f6743..3717569828bf 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -180,6 +180,20 @@ config USB_NET_CDCETHER IEEE 802 "local assignment" bit is set in the address, a "usbX" name is used instead. +config USB_NET_CDC_EEM + tristate "CDC EEM support" + depends on USB_USBNET && EXPERIMENTAL + help + This option supports devices conforming to the Communication Device + Class (CDC) Ethernet Emulation Model, a specification that's easy to + implement in device firmware. The CDC EEM specifications are available + from <http://www.usb.org/>. + + This driver creates an interface named "ethX", where X depends on + what other networking devices you have in use. However, if the + IEEE 802 "local assignment" bit is set in the address, a "usbX" + name is used instead. + config USB_NET_DM9601 tristate "Davicom DM9601 based USB 1.1 10/100 ethernet devices" depends on USB_USBNET |