diff options
author | David S. Miller <davem@davemloft.net> | 2011-11-09 22:22:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-09 22:22:15 +0100 |
commit | 3b971a7ceb2e39e0cab95c079c738b2052b3e02f (patch) | |
tree | 511e1112b22220c0f866718bbfa8cbee386f9d27 /drivers/bluetooth | |
parent | ipv4: fix for ip_options_rcv_srr() daddr update. (diff) | |
parent | Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linvill... (diff) | |
download | linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.tar.xz linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.zip |
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.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 */ }; |