diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
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[] = { | |||
| 1111 | /* Ovislink */ | 1111 | /* Ovislink */ |
| 1112 | { USB_DEVICE(0x1b75, 0x3071) }, | 1112 | { USB_DEVICE(0x1b75, 0x3071) }, |
| 1113 | { USB_DEVICE(0x1b75, 0x3072) }, | 1113 | { USB_DEVICE(0x1b75, 0x3072) }, |
| 1114 | { USB_DEVICE(0x1b75, 0xa200) }, | ||
| 1114 | /* Para */ | 1115 | /* Para */ |
| 1115 | { USB_DEVICE(0x20b8, 0x8888) }, | 1116 | { USB_DEVICE(0x20b8, 0x8888) }, |
| 1116 | /* Pegatron */ | 1117 | /* Pegatron */ |