diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-16 15:38:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 15:38:11 -0400 |
| commit | 05f8f25276ea8c7d41b3649890d6eaf179e67a81 (patch) | |
| tree | 49ff95cecc0dc2237b773ea8162f247d3d9c8582 /drivers/bluetooth/ath3k.c | |
| parent | 4416f5d2ac986923fcb6e42419c8a048dfda7584 (diff) | |
| parent | d839c81372d1f0caee47f87b26a68e91d4ff3847 (diff) | |
| download | linux-05f8f25276ea8c7d41b3649890d6eaf179e67a81.tar.gz linux-05f8f25276ea8c7d41b3649890d6eaf179e67a81.tar.bz2 linux-05f8f25276ea8c7d41b3649890d6eaf179e67a81.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/ath3k.c')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 57fd867553d7..aba22b2f12d6 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -81,6 +81,9 @@ static struct usb_device_id ath3k_table[] = { /* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) }, + /* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE03C) }, + { } /* Terminating entry */ }; @@ -99,6 +102,9 @@ static struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, + /* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, + { } /* Terminating entry */ }; |