Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / net / usb / Kconfig

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index a12c9c41b217e582b43a4a36b11d747821b5f6fe..68e198bd538bcc98d47091152eb2d518fdc2eba9 100644 (file)
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -129,7 +129,7 @@ config USB_USBNET
 
 config USB_NET_AX8817X
        tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
-       depends on USB_USBNET && NET_ETHERNET
+       depends on USB_USBNET
        select CRC32
        default y
        help
@@ -154,6 +154,16 @@ config USB_NET_AX8817X
          This driver creates an interface named "ethX", where X depends on
          what other networking devices you have in use.
 
+config USB_HSO
+       tristate "Option USB High Speed Mobile Devices"
+       depends on USB && RFKILL
+       default n
+       help
+         Choose this option if you have an Option HSDPA/HSUPA card.
+         These cards support downlink speeds of 7.2Mbps or greater.
+
+         To compile this driver as a module, choose M here: the
+         module will be called hso.
 
 config USB_NET_CDCETHER
        tristate "CDC Ethernet support (smart devices such as cable modems)"