diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-03 03:06:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-03 03:06:03 +0100 |
| commit | 7cbe010a5ea728d7c4440b11a1a3997faca0e46d (patch) | |
| tree | 9132c4c60a236f58f532086a0d8b8cc3fdf180fc /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | Staging: lustre: lnet: lnet: Better cookie gen (diff) | |
| parent | Linux 3.18-rc3 (diff) | |
| download | linux-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.tar.xz linux-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.zip | |
Merge 3.18-rc3 into staging-next
We want the upstream fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
| -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 573897b8e878..8444313eabe2 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -1111,6 +1111,7 @@ static struct usb_device_id rt2800usb_device_table[] = { /* Ovislink */ { USB_DEVICE(0x1b75, 0x3071) }, { USB_DEVICE(0x1b75, 0x3072) }, + { USB_DEVICE(0x1b75, 0xa200) }, /* Para */ { USB_DEVICE(0x20b8, 0x8888) }, /* Pegatron */ |