diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-18 00:09:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 00:09:11 -0400 |
| commit | 820ae8a80eb59962aefbbd4908dfe144ec0f9edb (patch) | |
| tree | 6c0f7356afff14e1c7d266de644810cd2de7caa9 /drivers/net/wireless/ath/ar9170/usb.c | |
| parent | 380fefb2ddabd4cd5f14dbe090481f0544e65078 (diff) | |
| parent | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/usb.c')
| -rw-r--r-- | drivers/net/wireless/ath/ar9170/usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 8663660ea4c6..abd083a357f5 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c | |||
| @@ -110,6 +110,8 @@ static struct usb_device_id ar9170_usb_ids[] = { | |||
| 110 | { USB_DEVICE(0x0409, 0x0249) }, | 110 | { USB_DEVICE(0x0409, 0x0249) }, |
| 111 | /* AVM FRITZ!WLAN USB Stick N 2.4 */ | 111 | /* AVM FRITZ!WLAN USB Stick N 2.4 */ |
| 112 | { USB_DEVICE(0x057C, 0x8402), .driver_info = AR9170_REQ_FW1_ONLY }, | 112 | { USB_DEVICE(0x057C, 0x8402), .driver_info = AR9170_REQ_FW1_ONLY }, |
| 113 | /* Qwest/Actiontec 802AIN Wireless N USB Network Adapter */ | ||
| 114 | { USB_DEVICE(0x1668, 0x1200) }, | ||
| 113 | 115 | ||
| 114 | /* terminate */ | 116 | /* terminate */ |
| 115 | {} | 117 | {} |