diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-07 09:27:53 +0200 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-07 09:27:53 +0200 |
commit | d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86 (patch) | |
tree | 61af7e7d4cdf7994f2bd6ffb8263f82fe304ea4c /drivers | |
parent | [TG3]: Update version and reldate. (diff) | |
parent | [Bluetooth] Correct SCO buffer for another Broadcom based dongle (diff) | |
download | linux-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.tar.xz linux-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bluetooth/hci_usb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 406af579ac3a..b0238b46dded 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -114,10 +114,16 @@ static struct usb_device_id blacklist_ids[] = { { USB_DEVICE(0x0a5c, 0x200a), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU }, { USB_DEVICE(0x0a5c, 0x2009), .driver_info = HCI_BCM92035 }, + /* Broadcom BCM2045 */ + { USB_DEVICE(0x0a5c, 0x2101), .driver_info = HCI_WRONG_SCO_MTU }, + /* IBM/Lenovo ThinkPad with Broadcom chip */ { USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU }, { USB_DEVICE(0x0a5c, 0x2110), .driver_info = HCI_WRONG_SCO_MTU }, + /* Targus ACB10US */ + { USB_DEVICE(0x0a5c, 0x2100), .driver_info = HCI_RESET }, + /* ANYCOM Bluetooth USB-200 and USB-250 */ { USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET }, |