diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-15 13:23:09 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-15 13:23:09 -0500 |
| commit | a463e9c57ac1f21e40bc8bff77a4de082ebc432e (patch) | |
| tree | b6f0ed4bde2227feb29f69d9312c14d528d754a5 /drivers/bluetooth | |
| parent | 67e2c3883828b39548cee2091b36656787775d95 (diff) | |
| parent | 9845904fd489288bcf693642c1b31cc463c0b660 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 2 | ||||
| -rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index fce758896280..1ee27ac18de0 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
| @@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_table[] = { | |||
| 87 | { USB_DEVICE(0x04CA, 0x3007) }, | 87 | { USB_DEVICE(0x04CA, 0x3007) }, |
| 88 | { USB_DEVICE(0x04CA, 0x3008) }, | 88 | { USB_DEVICE(0x04CA, 0x3008) }, |
| 89 | { USB_DEVICE(0x04CA, 0x300b) }, | 89 | { USB_DEVICE(0x04CA, 0x300b) }, |
| 90 | { USB_DEVICE(0x04CA, 0x3010) }, | ||
| 90 | { USB_DEVICE(0x0930, 0x0219) }, | 91 | { USB_DEVICE(0x0930, 0x0219) }, |
| 91 | { USB_DEVICE(0x0930, 0x0220) }, | 92 | { USB_DEVICE(0x0930, 0x0220) }, |
| 92 | { USB_DEVICE(0x0930, 0x0227) }, | 93 | { USB_DEVICE(0x0930, 0x0227) }, |
| @@ -140,6 +141,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { | |||
| 140 | { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, | 141 | { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, |
| 141 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, | 142 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, |
| 142 | { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, | 143 | { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, |
| 144 | { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, | ||
| 143 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, | 145 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, |
| 144 | { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, | 146 | { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, |
| 145 | { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, | 147 | { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 31dd24ac9926..19cf2cf22e87 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -167,6 +167,7 @@ static const struct usb_device_id blacklist_table[] = { | |||
| 167 | { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, | 167 | { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, |
| 168 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, | 168 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, |
| 169 | { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, | 169 | { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, |
| 170 | { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, | ||
| 170 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, | 171 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, |
| 171 | { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, | 172 | { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, |
| 172 | { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, | 173 | { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, |