aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanoharan@atheros.com>2010-11-19 16:53:20 +0530
committerJohn W. Linville <linville@tuxdriver.com>2010-11-24 16:19:40 -0500
commit64f121708342afec306ce52920cc9982f4f1008f (patch)
treef6d4ce16dc611697ba80ccb51d214095d122e958 /drivers
parentath: Add a driver_info bitmask field (diff)
downloadlinux-dev-64f121708342afec306ce52920cc9982f4f1008f.tar.xz
linux-dev-64f121708342afec306ce52920cc9982f4f1008f.zip
ath9k_htc: Add driver_info in usb device list
Added driver_info to identify AR7010, R9287 HTC devices. Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/hif_usb.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index dfb6560dab92..6a0dbd153349 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -28,10 +28,16 @@ MODULE_FIRMWARE(FIRMWARE_AR9271);
static struct usb_device_id ath9k_hif_usb_ids[] = {
{ USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
{ USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
- { USB_DEVICE(0x0cf3, 0x7010) }, /* Atheros */
- { USB_DEVICE(0x0cf3, 0x7015) }, /* Atheros */
+ { USB_DEVICE(0x0cf3, 0x7010),
+ .driver_info = AR7010_DEVICE },
+ /* Atheros */
+ { USB_DEVICE(0x0cf3, 0x7015),
+ .driver_info = AR7010_DEVICE | AR9287_DEVICE },
+ /* Atheros */
{ USB_DEVICE(0x0846, 0x9030) }, /* Netgear N150 */
- { USB_DEVICE(0x0846, 0x9018) }, /* Netgear WNDA3200 */
+ { USB_DEVICE(0x0846, 0x9018),
+ .driver_info = AR7010_DEVICE },
+ /* Netgear WNDA3200 */
{ USB_DEVICE(0x07D1, 0x3A10) }, /* Dlink Wireless 150 */
{ USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */
{ USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */
@@ -40,9 +46,13 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
{ USB_DEVICE(0x13D3, 0x3349) }, /* Azurewave */
{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
- { USB_DEVICE(0x083A, 0xA704) }, /* SMC Networks */
+ { USB_DEVICE(0x083A, 0xA704),
+ .driver_info = AR7010_DEVICE },
+ /* SMC Networks */
{ USB_DEVICE(0x040D, 0x3801) }, /* VIA */
- { USB_DEVICE(0x1668, 0x1200) }, /* Verizon */
+ { USB_DEVICE(0x1668, 0x1200),
+ .driver_info = AR7010_DEVICE | AR9287_DEVICE },
+ /* Verizon */
{ },
};