diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-01-06 14:08:41 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-01-06 14:08:41 -0500 |
commit | 9d1cd503c7618d2eb00746fa1ebb06a723e108b4 (patch) | |
tree | 53a1e729bf936ff861a55f6751d61733fff1434b /drivers/bluetooth/btusb.c | |
parent | c8bf40ad4f8f5d26f6744020ad51be420a707385 (diff) | |
parent | b7e047358449f8eb5cba8197b42280b676b82e54 (diff) | |
download | linux-9d1cd503c7618d2eb00746fa1ebb06a723e108b4.tar.gz linux-9d1cd503c7618d2eb00746fa1ebb06a723e108b4.tar.bz2 linux-9d1cd503c7618d2eb00746fa1ebb06a723e108b4.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index bfbcc5a772a6..9f7e539de510 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -155,6 +155,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 }, |