diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 16:43:51 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 16:43:51 -0500 |
| commit | 1b68e676204927f69e987b86a99e19e61cc37dcc (patch) | |
| tree | 6649cd203406aa3286d85d505106e058d5d5c338 /drivers/bluetooth/ath3k.c | |
| parent | 0f5cd45960173ba5b36727decbb4a241cbd35ef9 (diff) | |
| parent | e9036e336a8e5640871e0006ea4a89982b25046f (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 333c21289d97..6dcd55a74c0a 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
| @@ -41,6 +41,9 @@ static struct usb_device_id ath3k_table[] = { | |||
| 41 | 41 | ||
| 42 | /* Atheros AR9285 Malbec with sflash firmware */ | 42 | /* Atheros AR9285 Malbec with sflash firmware */ |
| 43 | { USB_DEVICE(0x03F0, 0x311D) }, | 43 | { USB_DEVICE(0x03F0, 0x311D) }, |
| 44 | |||
| 45 | /* Atheros AR5BBU12 with sflash firmware */ | ||
| 46 | { USB_DEVICE(0x0489, 0xE02C) }, | ||
| 44 | { } /* Terminating entry */ | 47 | { } /* Terminating entry */ |
| 45 | }; | 48 | }; |
| 46 | 49 | ||