diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:56:36 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:56:43 -0500 |
| commit | 218502bfe674f570205367b9094048207b04ba15 (patch) | |
| tree | c6187b97e7c79d902aef08f049e9fba04c421d56 /drivers/bluetooth/ath3k.c | |
| parent | 51327ada7142ab520ed610a42572d1f4cbfbb2dc (diff) | |
| parent | 6d83f94db95cfe65d2a6359cccdf61cf087c2598 (diff) | |
Merge branch 'irq/urgent' into irq/core
Reason: Further patches are conflicting with mainline fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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[] = { | |||
| 39 | /* Atheros AR3011 with sflash firmware*/ | 39 | /* Atheros AR3011 with sflash firmware*/ |
| 40 | { USB_DEVICE(0x0CF3, 0x3002) }, | 40 | { USB_DEVICE(0x0CF3, 0x3002) }, |
| 41 | 41 | ||
| 42 | /* Atheros AR9285 Malbec with sflash firmware */ | ||
| 43 | { USB_DEVICE(0x03F0, 0x311D) }, | ||
| 42 | { } /* Terminating entry */ | 44 | { } /* Terminating entry */ |
| 43 | }; | 45 | }; |
| 44 | 46 | ||