diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
| commit | b67afe7f43afd2f5cd98798993561920c1684c12 (patch) | |
| tree | e45a0e41c91a1d199fd865b011ed0d25f5497bb9 /drivers/bluetooth/ath3k.c | |
| parent | db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 (diff) | |
| parent | 28bec7b845e10b68e6ba1ade5de0fc566690fc61 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
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 e6acaba1e45c..5577ed656e2f 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
| @@ -69,6 +69,9 @@ static struct usb_device_id ath3k_table[] = { | |||
| 69 | /* Atheros AR3012 with sflash firmware*/ | 69 | /* Atheros AR3012 with sflash firmware*/ |
| 70 | { USB_DEVICE(0x0CF3, 0x3004) }, | 70 | { USB_DEVICE(0x0CF3, 0x3004) }, |
| 71 | 71 | ||
| 72 | /* Atheros AR5BBU12 with sflash firmware */ | ||
| 73 | { USB_DEVICE(0x0489, 0xE02C) }, | ||
| 74 | |||
| 72 | { } /* Terminating entry */ | 75 | { } /* Terminating entry */ |
| 73 | }; | 76 | }; |
| 74 | 77 | ||