diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-14 12:51:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-14 12:51:42 -0800 |
| commit | 8bc26a008f61eac5631701cbd65f88c015a63280 (patch) | |
| tree | c85eb9e5a14b406a4dd6625c57029ec266e7dc80 /drivers/bluetooth/ath3k.c | |
| parent | ddfdb508866b3c07b295f6c85c271981d88afe4c (diff) | |
| parent | a7b545f7fe753ca3dc1b51ca57f90cd59d974e44 (diff) | |
| download | blackbird-op-linux-8bc26a008f61eac5631701cbd65f88c015a63280.tar.gz blackbird-op-linux-8bc26a008f61eac5631701cbd65f88c015a63280.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 */ }; |
