diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-12-18 13:46:08 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-18 13:46:08 -0500 |
commit | b7e047358449f8eb5cba8197b42280b676b82e54 (patch) | |
tree | 88174a5fa109cb71eee4dd6413e35c7412095769 /drivers/bluetooth/btusb.c | |
parent | 73f0b56a1ff64e7fb6c3a62088804bab93bcedc2 (diff) | |
parent | 1bc5ad168f441f6f8bfd944288a5f7b4963ac1f6 (diff) | |
download | op-kernel-dev-b7e047358449f8eb5cba8197b42280b676b82e54.zip op-kernel-dev-b7e047358449f8eb5cba8197b42280b676b82e54.tar.gz |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
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 c0ff34f..3980fd1 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -154,6 +154,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 }, |