diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 13:41:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 13:41:11 -0500 |
commit | e29ec6247053ad60bd0b36f155b647364a615097 (patch) | |
tree | dc74d48f7e0c548d51d4561b3a750a47eb1cdaea /drivers/bluetooth | |
parent | 1a6422f67fbf691cf8721076619aeead9183403d (diff) | |
parent | cc438fccd5783c9f7b4c4858358ac897dcf8a58d (diff) | |
download | op-kernel-dev-e29ec6247053ad60bd0b36f155b647364a615097.zip op-kernel-dev-e29ec6247053ad60bd0b36f155b647364a615097.tar.gz |
Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 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 */ }; |