Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 8ee21030e9ac8db040e75f006950e4b7b16c66ee..3717569828bf360f16a8bc6b8138c6965269bddd 100644 (file)
--- 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
@@ -345,4 +359,12 @@ config USB_HSO
          To compile this driver as a module, choose M here: the
          module will be called hso.
 
+config USB_NET_INT51X1
+       tristate "Intellon PLC based usb adapter"
+       depends on USB_USBNET
+       help
+         Choose this option if you're using a 14Mb USB-based PLC
+         (Powerline Communications) solution with an Intellon
+         INT51x1/INT5200 chip, like the "devolo dLan duo".
+
 endmenu