diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-08 14:59:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-08 14:59:14 -0500 |
| commit | 9270fd61a3b3efecb06d77f71efec6fb7daccb25 (patch) | |
| tree | fa8c681c4599b10a4aa6ef096eb9447b46e223ec /drivers | |
| parent | 24b9c373ab787ccacfa2c46736153708796f5cd6 (diff) | |
| parent | d13431ca3eb2a2c14314f04813cdc11cd869f150 (diff) | |
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 f9b726091ad..fe4ebc375b3 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -100,6 +100,9 @@ static struct usb_device_id btusb_table[] = { | |||
| 100 | /* Canyon CN-BTU1 with HID interfaces */ | 100 | /* Canyon CN-BTU1 with HID interfaces */ |
| 101 | { USB_DEVICE(0x0c10, 0x0000) }, | 101 | { USB_DEVICE(0x0c10, 0x0000) }, |
| 102 | 102 | ||
| 103 | /* Broadcom BCM20702A0 */ | ||
| 104 | { USB_DEVICE(0x413c, 0x8197) }, | ||
| 105 | |||
| 103 | { } /* Terminating entry */ | 106 | { } /* Terminating entry */ |
| 104 | }; | 107 | }; |
| 105 | 108 | ||