diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-01 12:38:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-01 12:38:18 -0800 |
| commit | 6ea25a6c2b95cf916e844fe2bacdd1c15b72e4c5 (patch) | |
| tree | f3adbf370e69aee01bf432d18fdb9a1d79adf313 /drivers/net/wireless/ath/carl9170/usb.c | |
| parent | 0a5f38467765ee15478db90d81e40c269c8dda20 (diff) | |
| parent | 2b799a6b25bb9f9fbc478782cd9503e8066ab618 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/usb.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index 537732e5964..f82c400be28 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c @@ -118,6 +118,8 @@ static struct usb_device_id carl9170_usb_ids[] = { { USB_DEVICE(0x057c, 0x8402) }, /* Qwest/Actiontec 802AIN Wireless N USB Network Adapter */ { USB_DEVICE(0x1668, 0x1200) }, + /* Airlive X.USB a/b/g/n */ + { USB_DEVICE(0x1b75, 0x9170) }, /* terminate */ {} |