diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-09 15:30:42 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-09 15:30:42 -0500 |
| commit | 5dc0fa782ad4a2cfad93c016765492083e687cf3 (patch) | |
| tree | a7c41c15779b5cbeafcfdc445f796c46d80ec0c0 /drivers/bluetooth/ath3k.c | |
| parent | fc7c976dc7a565213393ce700d4a6105f037bf20 (diff) | |
| parent | e733fb62082b3b187870dfba28d5f6730b8436c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'drivers/bluetooth/ath3k.c')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index a126e614601f..333c21289d97 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -39,6 +39,8 @@ static struct usb_device_id ath3k_table[] = { /* Atheros AR3011 with sflash firmware*/ { USB_DEVICE(0x0CF3, 0x3002) }, + /* Atheros AR9285 Malbec with sflash firmware */ + { USB_DEVICE(0x03F0, 0x311D) }, { } /* Terminating entry */ }; |