diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 19:03:00 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 19:03:00 +0100 |
| commit | d2ff5ee919f0b1377595df80ba49c9921ce4ee62 (patch) | |
| tree | e3e92aff76d158ee8f956a113b7f10b4ea145f87 /drivers/bluetooth | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | Bluetooth: Remove OOB data if device was discovered in band (diff) | |
| download | linux-d2ff5ee919f0b1377595df80ba49c9921ce4ee62.tar.xz linux-d2ff5ee919f0b1377595df80ba49c9921ce4ee62.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index ee82f2fb65f0..a1d4ede5b892 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -96,6 +96,7 @@ static struct usb_device_id btusb_table[] = { { USB_DEVICE(0x0c10, 0x0000) }, /* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0b05, 0x17b5) }, { USB_DEVICE(0x04ca, 0x2003) }, { USB_DEVICE(0x0489, 0xe042) }, { USB_DEVICE(0x413c, 0x8197) }, |