diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 21:23:14 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 21:23:14 (GMT) |
commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /drivers/net/wireless/rt2x00/rt73usb.c | |
parent | 3bf63e59e577cbecd41334c866f501c4cc5d54c5 (diff) | |
parent | c7c1806098752c1f46943d8db2c69aff07f5d4bc (diff) | |
download | linux-fsl-qoriq-3e11210d46a4f252f41db6e442b46026aeddbb59.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 0b4e859..029be3c 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -2446,6 +2446,7 @@ static struct usb_device_id rt73usb_device_table[] = { { USB_DEVICE(0x04bb, 0x093d), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x148f, 0x2671), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x0812, 0x3101), USB_DEVICE_DATA(&rt73usb_ops) }, /* Qcom */ { USB_DEVICE(0x18e8, 0x6196), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x18e8, 0x6229), USB_DEVICE_DATA(&rt73usb_ops) }, |