summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-03 12:28:27 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-03 12:28:27 -0800
commitced3985faebc232deec0dd9cc375cb5a43d18391 (patch)
tree373ec11d9af6046dbb81e08c7317d1a8eea63a69 /Documentation
parentf1f2d8713d16a1e198880bbc716eb24fae09c858 (diff)
parent18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 (diff)
downloadlinux-ced3985faebc232deec0dd9cc375cb5a43d18391.tar.gz
linux-ced3985faebc232deec0dd9cc375cb5a43d18391.tar.bz2
linux-ced3985faebc232deec0dd9cc375cb5a43d18391.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: use MII hooks only if CONFIG_MII is enabled USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB: xpad: additional USB id's added USB: fix compiler issues with newer gcc versions USB: HID: add blacklist AIRcable USB, little beautification USB: usblp: fix system suspend for some systems USB: failure in usblp's error path usbtouchscreen: use endpoint address from endpoint descriptor USB: sierra: Fix id for Sierra Wireless MC8755 in new table USB: new VID/PID-combos for cp2101 hid-core: big-endian fix fix USB: usb-storage: Unusual_dev update USB: add another sierra wireless device id
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/usb/usb-serial.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 8dc2bacc8f1f..50436e1663ea 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -428,12 +428,6 @@ 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
If your device is not one of the above listed devices, compatible with