-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
- Loading branch information
Showing
80 changed files
with
8,556 additions
and
3,812 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,60 @@ | ||
# | ||
# USB ATM driver configuration | ||
# USB/ATM DSL configuration | ||
# | ||
comment "USB ATM/DSL drivers" | ||
|
||
menu "USB DSL modem support" | ||
depends on USB | ||
|
||
config USB_ATM | ||
tristate "Generic USB ATM/DSL core I/O support" | ||
tristate "USB DSL modem support" | ||
depends on USB && ATM | ||
select CRC32 | ||
default n | ||
help | ||
This provides a library which is used for packet I/O by USB DSL | ||
modems, such as the SpeedTouch driver below. | ||
Say Y here if you want to connect a USB Digital Subscriber Line (DSL) | ||
modem to your computer's USB port. You will then need to choose your | ||
modem from the list below. | ||
|
||
To compile this driver as a module, choose M here: the | ||
module will be called usb_atm. | ||
module will be called usbatm. | ||
|
||
config USB_SPEEDTOUCH | ||
tristate "Alcatel Speedtouch USB support" | ||
depends on USB && ATM | ||
select USB_ATM | ||
tristate "Speedtouch USB support" | ||
depends on USB_ATM | ||
select FW_LOADER | ||
help | ||
Say Y here if you have an Alcatel SpeedTouch USB or SpeedTouch 330 | ||
Say Y here if you have an SpeedTouch USB or SpeedTouch 330 | ||
modem. In order to use your modem you will need to install the | ||
two parts of the firmware, extracted by the user space tools; see | ||
<http://www.linux-usb.org/SpeedTouch/> for details. | ||
|
||
To compile this driver as a module, choose M here: the | ||
module will be called speedtch. | ||
|
||
config USB_CXACRU | ||
tristate "Conexant AccessRunner USB support" | ||
depends on USB_ATM | ||
select FW_LOADER | ||
help | ||
Say Y here if you have an ADSL USB modem based on the Conexant | ||
AccessRunner chipset. In order to use your modem you will need to | ||
install the firmware, extracted by the user space tools; see | ||
<http://accessrunner.sourceforge.net/> for details. | ||
|
||
To compile this driver as a module, choose M here: the | ||
module will be called cxacru. | ||
|
||
config USB_XUSBATM | ||
tristate "Other USB DSL modem support" | ||
depends on USB_ATM | ||
help | ||
Say Y here if you have a DSL USB modem not explicitly supported by | ||
another USB DSL drivers. In order to use your modem you will need to | ||
pass the vendor ID, product ID, and endpoint numbers for transmission | ||
and reception as module parameters. You may need to initialize the | ||
the modem using a user space utility (a firmware loader for example). | ||
|
||
To compile this driver as a module, choose M here: the | ||
module will be called xusbatm. | ||
|
||
endmenu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
# | ||
# Makefile for the rest of the USB drivers | ||
# (the ones that don't fit into any other categories) | ||
# Makefile for USB ATM/xDSL drivers | ||
# | ||
|
||
obj-$(CONFIG_USB_ATM) += usb_atm.o | ||
obj-$(CONFIG_USB_CXACRU) += cxacru.o | ||
obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o | ||
obj-$(CONFIG_USB_ATM) += usbatm.o | ||
obj-$(CONFIG_USB_XUSBATM) += xusbatm.o |
Oops, something went wrong.