diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:20:59 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:20:59 -0800 |
commit | deef2a118aed02aa9421e399056c82045e728282 (patch) | |
tree | ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f /drivers/staging/rtl8188eu/os_dep | |
parent | aa9d9be96d33d97488e1bdf13a144931a3fce08e (diff) | |
parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
download | op-kernel-dev-deef2a118aed02aa9421e399056c82045e728282.zip op-kernel-dev-deef2a118aed02aa9421e399056c82045e728282.tar.gz |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep')
-rw-r--r-- | drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c index 65a257f..d3cbcc4 100644 --- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c +++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c @@ -47,6 +47,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = { {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */ {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */ + {USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */ {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */ {} /* Terminating entry */ }; |