diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-14 14:50:46 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-14 14:50:46 -0700 |
commit | b793b3a75e12ae4576f3d9b6013c8a7d8b0277b8 (patch) | |
tree | e493685833f06462afd5d4edc6e231c33131a633 /drivers/net/usb/Kconfig | |
parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
parent | c0912585ec8b64d846d56995241f2c8a7f48ee75 (diff) |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/usb/Kconfig')
-rw-r--r-- | drivers/net/usb/Kconfig | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 68e198bd538..0973b6e3702 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -154,17 +154,6 @@ 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)" depends on USB_USBNET @@ -337,5 +326,15 @@ config USB_NET_ZAURUS really need this non-conformant variant of CDC Ethernet (or in some cases CDC MDLM) protocol, not "g_ether". +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. endmenu |