diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:41:41 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:41:41 +0200 |
| commit | 7af0f839f4eedfccc7128d62df1e0bdebc3def11 (patch) | |
| tree | 17a935af54c45cda636ef3b462045de57a786b98 /drivers/hid/hid-ids.h | |
| parent | 67fe00d8c39fcb9ac6a851f605328e01d0568e93 (diff) | |
| parent | f7c4f737ced2b9e0ba412ed7be9683f80c247bd2 (diff) | |
| download | linux-7af0f839f4eedfccc7128d62df1e0bdebc3def11.tar.gz linux-7af0f839f4eedfccc7128d62df1e0bdebc3def11.tar.bz2 linux-7af0f839f4eedfccc7128d62df1e0bdebc3def11.zip | |
Merge branch 'for-5.4/sb0540' into for-linus
- support for Creative SB0540 IR receivers, from Bastien Nocera
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index a8c1ebf49c0d..76969a22b0f2 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -314,6 +314,7 @@ #define USB_VENDOR_ID_CREATIVELABS 0x041e #define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51 0x322c #define USB_DEVICE_ID_PRODIKEYS_PCMIDI 0x2801 +#define USB_DEVICE_ID_CREATIVE_SB0540 0x3100 #define USB_VENDOR_ID_CVTOUCH 0x1ff7 #define USB_DEVICE_ID_CVTOUCH_SCREEN 0x0013 |