summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-09 16:22:15 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-09 16:22:15 -0500
commit3b971a7ceb2e39e0cab95c079c738b2052b3e02f (patch)
tree511e1112b22220c0f866718bbfa8cbee386f9d27 /drivers/bluetooth
parentb12f62efb8ec0b9523bdb6c2d412c07193086de9 (diff)
parente29ec6247053ad60bd0b36f155b647364a615097 (diff)
downloadop-kernel-dev-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.zip
op-kernel-dev-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.tar.gz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btusb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f9b7260..fe4ebc3 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 */
};
OpenPOWER on IntegriCloud