diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-13 13:29:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-13 13:29:56 -0400 |
| commit | d15591b008c2b758e480660ecca85889f99bc240 (patch) | |
| tree | e6a0ce2254e1f026ab347c323d4b32f91747ee8e /drivers/bluetooth | |
| parent | de121989c8b5d946144354fce070f77e698e2cff (diff) | |
| parent | 94a32d10f47b637ae24b78b1ddc7ef0e8396fda4 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 4 | ||||
| -rw-r--r-- | drivers/bluetooth/btusb.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index a8a41e07a221..b282af181b44 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
| @@ -74,8 +74,10 @@ static struct usb_device_id ath3k_table[] = { | |||
| 74 | 74 | ||
| 75 | /* Atheros AR3012 with sflash firmware*/ | 75 | /* Atheros AR3012 with sflash firmware*/ |
| 76 | { USB_DEVICE(0x0CF3, 0x3004) }, | 76 | { USB_DEVICE(0x0CF3, 0x3004) }, |
| 77 | { USB_DEVICE(0x0CF3, 0x3008) }, | ||
| 77 | { USB_DEVICE(0x0CF3, 0x311D) }, | 78 | { USB_DEVICE(0x0CF3, 0x311D) }, |
| 78 | { USB_DEVICE(0x13d3, 0x3375) }, | 79 | { USB_DEVICE(0x13d3, 0x3375) }, |
| 80 | { USB_DEVICE(0x04CA, 0x3004) }, | ||
| 79 | { USB_DEVICE(0x04CA, 0x3005) }, | 81 | { USB_DEVICE(0x04CA, 0x3005) }, |
| 80 | { USB_DEVICE(0x04CA, 0x3006) }, | 82 | { USB_DEVICE(0x04CA, 0x3006) }, |
| 81 | { USB_DEVICE(0x04CA, 0x3008) }, | 83 | { USB_DEVICE(0x04CA, 0x3008) }, |
| @@ -106,8 +108,10 @@ static struct usb_device_id ath3k_blist_tbl[] = { | |||
| 106 | 108 | ||
| 107 | /* Atheros AR3012 with sflash firmware*/ | 109 | /* Atheros AR3012 with sflash firmware*/ |
| 108 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, | 110 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, |
| 111 | { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, | ||
| 109 | { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, | 112 | { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, |
| 110 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, | 113 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, |
| 114 | { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, | ||
| 111 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, | 115 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, |
| 112 | { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, | 116 | { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, |
| 113 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, | 117 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 7e351e345476..e547851870e7 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -132,8 +132,10 @@ static struct usb_device_id blacklist_table[] = { | |||
| 132 | 132 | ||
| 133 | /* Atheros 3012 with sflash firmware */ | 133 | /* Atheros 3012 with sflash firmware */ |
| 134 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, | 134 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, |
| 135 | { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, | ||
| 135 | { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, | 136 | { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, |
| 136 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, | 137 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, |
| 138 | { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, | ||
| 137 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, | 139 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, |
| 138 | { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, | 140 | { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, |
| 139 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, | 141 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, |