diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
commit | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (patch) | |
tree | 4d5439bafd38dc730838bb15e6a49e747793d4a7 /include/media/dvb-usb-ids.h | |
parent | 9cd20ef7803cc53a00c6eb7198b3d870ac7b3766 (diff) | |
parent | 7ed093602e0e1b60a0fc074a9692687e7d2b723d (diff) | |
download | linux-fa41d6ee904266fa8739cafa6ec038c3a8e435b7.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Backmerging to pull in HDR DP code:
https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'include/media/dvb-usb-ids.h')
-rw-r--r-- | include/media/dvb-usb-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h index 52875e3eee71..7ce4e8332421 100644 --- a/include/media/dvb-usb-ids.h +++ b/include/media/dvb-usb-ids.h @@ -388,6 +388,7 @@ #define USB_PID_MYGICA_D689 0xd811 #define USB_PID_MYGICA_T230 0xc688 #define USB_PID_MYGICA_T230C 0xc689 +#define USB_PID_MYGICA_T230C2 0xc68a #define USB_PID_ELGATO_EYETV_DIVERSITY 0x0011 #define USB_PID_ELGATO_EYETV_DTT 0x0021 #define USB_PID_ELGATO_EYETV_DTT_2 0x003f |