diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
| commit | af31ff8a1496c68089c3a2ff50d45c64ec765d34 (patch) | |
| tree | 5671465bb6ba3a17b66ce04eb7fab4220c70a73b /drivers/hid/hid-ids.h | |
| parent | 535f95d0a6164c60f3c34a0864d653e016decde1 (diff) | |
| parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151008.0ll_20151008.0
Conflicting files:
arch/arm64/configs/defconfig
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index f769208276ae..e10908b7ec88 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1047,4 +1047,8 @@ #define USB_DEVICE_ID_RAPHNET_2NES2SNES 0x0002 #define USB_DEVICE_ID_RAPHNET_4NES4SNES 0x0003 +/* Lilliput Capacitive TouchScreen */ +#define USB_VENDOR_ID_LILLIPUT 0x1391 +#define USB_PROD_ID_LILLIPUT 0x2112 + #endif |