diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
commit | f90ae1b62bedd8b57966a7be68855f2d43170db6 (patch) | |
tree | dc332d18219749a17b163d740b8713be5e8d940b /drivers/usb/class/usbtmc.c | |
parent | 346a8beb760237fb0fed811045ec92c799f48d54 (diff) | |
parent | 60917545df1ffc7f918550512dc4a14758f74784 (diff) |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-16.01
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
-rw-r--r-- | drivers/usb/class/usbtmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index ec978408a2ee..49978cc495e9 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -109,6 +109,7 @@ struct usbtmc_ID_rigol_quirk { static const struct usbtmc_ID_rigol_quirk usbtmc_id_quirk[] = { { 0x1ab1, 0x0588 }, + { 0x1ab1, 0x04b0 }, { 0, 0 } }; |