diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-30 04:44:25 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-30 04:44:25 +0100 |
commit | 7f9d3577e2603ca279c3176b696eba392f21cbe2 (patch) | |
tree | e2135eddba600910cdebb54c8b01de53473ecefb /drivers/net/wireless/rt2x00 | |
parent | NET: XFRM: Fix spelling of neighbour. (diff) | |
parent | Revert "b43: Enforce DMA descriptor memory constraints" (diff) | |
download | linux-7f9d3577e2603ca279c3176b696eba392f21cbe2.tar.xz linux-7f9d3577e2603ca279c3176b696eba392f21cbe2.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index af85d18cdbe7..ab95346cf6a3 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -922,6 +922,7 @@ static struct usb_device_id rt2800usb_device_table[] = { { USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x1737, 0x0077), USB_DEVICE_DATA(&rt2800usb_ops) }, + { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) }, /* Logitec */ { USB_DEVICE(0x0789, 0x0162), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x0789, 0x0163), USB_DEVICE_DATA(&rt2800usb_ops) }, |