diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 01:42:21 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 01:42:21 (GMT) |
| commit | 73b227771899acd0039a9634a3c367cfadd211c1 (patch) | |
| tree | f61f0ab5be4999d958c5bbf052089dcd29f04d3d /drivers/staging/rtl8188eu/os_dep/usb_intf.c | |
| parent | b4e8459947e167f326795bf3dbc06c04b2a12d1d (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-fsl-qoriq-73b227771899acd0039a9634a3c367cfadd211c1.tar.xz | |
Merge 3.12-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep/usb_intf.c')
| -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 6e40299..7d14779 100644 --- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c +++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c @@ -54,6 +54,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = { /*=== Customer ID ===*/ /****** 8188EUS ********/ {USB_DEVICE(0x8179, 0x07B8)}, /* Abocom - Abocom */ + {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {} /* Terminating entry */ }; |