Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36463
b: refs/heads/master
c: 3fe70ba
h: refs/heads/master
i:
  36461: f633a98
  36459: fbbb313
  36455: 16c25ce
  36447: 1f272ca
v: v3
  • Loading branch information
Manuel Francisco Naranjo authored and Greg Kroah-Hartman committed Sep 27, 2006
1 parent 987cdfb commit ba23cff
Show file tree
Hide file tree
Showing 5 changed files with 642 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 78aef519ed07797f94cff1d0d66dd01704474916
refs/heads/master: 3fe70ba2272c123cf38e4c577bf220f8bcf25366
5 changes: 5 additions & 0 deletions trunk/Documentation/usb/usb-serial.txt
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,11 @@ Options supported:
See http://www.uuhaus.de/linux/palmconnect.html for up-to-date
information on this driver.

AIRcable USB Dongle Bluetooth driver
If there is the cdc_acm driver loaded in the system, you will find that the
cdc_acm claims the device before AIRcable can. This is simply corrected
by unloading both modules and then loading the aircable module before
cdc_acm module

Generic Serial driver

Expand Down
10 changes: 10 additions & 0 deletions trunk/drivers/usb/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ config USB_SERIAL_GENERIC
support" be compiled as a module for this driver to be used
properly.

config USB_SERIAL_AIRCABLE
tristate "AIRcable USB Bluetooth Dongle Driver (EXPERIMENTAL)"
depends on USB_SERIAL && EXPERIMENTAL
help
Say Y here if you want to use AIRcable USB Bluetoot Dongle.

To compile this driver as a module, choose M here: the module
will be called aircable.

config USB_SERIAL_AIRPRIME
tristate "USB AirPrime CDMA Wireless Driver"
depends on USB_SERIAL
Expand Down Expand Up @@ -526,5 +535,6 @@ config USB_EZUSB
depends on USB_SERIAL_KEYSPAN_PDA || USB_SERIAL_XIRCOM || USB_SERIAL_KEYSPAN || USB_SERIAL_WHITEHEAT
default y


endmenu

1 change: 1 addition & 0 deletions trunk/drivers/usb/serial/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ usbserial-obj-$(CONFIG_USB_EZUSB) += ezusb.o

usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y)

obj-$(CONFIG_USB_SERIAL_AIRCABLE) += aircable.o
obj-$(CONFIG_USB_SERIAL_AIRPRIME) += airprime.o
obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o
obj-$(CONFIG_USB_SERIAL_BELKIN) += belkin_sa.o
Expand Down
Loading

0 comments on commit ba23cff

Please sign in to comment.