diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-08 20:59:14 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-08 20:59:14 +0100 |
| commit | 9270fd61a3b3efecb06d77f71efec6fb7daccb25 (patch) | |
| tree | fa8c681c4599b10a4aa6ef096eb9447b46e223ec /drivers | |
| parent | mac80211: uAPSD - fix IEEE80211_FCTL_MOREDATA bit setting (diff) | |
| parent | Bluetooth: Add support for Broadcom BCM20702A0 (diff) | |
| download | linux-9270fd61a3b3efecb06d77f71efec6fb7daccb25.tar.xz linux-9270fd61a3b3efecb06d77f71efec6fb7daccb25.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index f9b726091ad0..fe4ebc375b3d 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -100,6 +100,9 @@ static struct usb_device_id btusb_table[] = { /* Canyon CN-BTU1 with HID interfaces */ { USB_DEVICE(0x0c10, 0x0000) }, + /* Broadcom BCM20702A0 */ + { USB_DEVICE(0x413c, 0x8197) }, + { } /* Terminating entry */ }; |