summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJan Puk <janpuk@volny.cz>2011-02-22 14:49:43 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-25 15:21:50 -0500
commitc86664e5a285af1afa06416e450e7c4af04daa7c (patch)
tree367d0500e97bf519f9367473f30087d705bc4384 /drivers/net
parent385918cc6af74e2b7ae10ec3ccaeea9a83e8e43e (diff)
downloadblackbird-op-linux-c86664e5a285af1afa06416e450e7c4af04daa7c.tar.gz
blackbird-op-linux-c86664e5a285af1afa06416e450e7c4af04daa7c.zip
carl9170: add Airlive X.USB a/b/g/n USBID
"AirLive X.USB now works perfectly under a Linux environment!" Cc: <stable@kernel.org> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/carl9170/usb.c2
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 537732e5964f..f82c400be288 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 */
{}
OpenPOWER on IntegriCloud