diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-21 16:40:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-21 16:40:04 -0300 |
| commit | 3cf0c6bd68915aee3b5827b960e485de201e42c1 (patch) | |
| tree | 51a4301194ce3e6d13cd97949f922936b0330af6 /drivers/media/dvb-core/dvb-usb-ids.h | |
| parent | f5281fc81e9a0a3e80b78720c5ae2ed06da3bfae (diff) | |
| parent | c1f03b486429633597bccbee413fb621b53603a8 (diff) | |
| download | linux-stable-3cf0c6bd68915aee3b5827b960e485de201e42c1.tar.gz linux-stable-3cf0c6bd68915aee3b5827b960e485de201e42c1.tar.bz2 linux-stable-3cf0c6bd68915aee3b5827b960e485de201e42c1.zip | |
Merge remote-tracking branch 'linus/master' into patchwork
There are some patches that depends on media-v3.16-rc6.
So, merge back from upstream before applying them.
* linus/master: (1123 commits)
drm/nouveau: ltc/gf100-: fix cbc issues on certain boards
drm/bochs: add missing drm_connector_register call
drm/cirrus: add missing drm_connector_register call
staging: vt6655: buffer overflow in ioctl
USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
USB: EHCI: unlink QHs even after the controller has stopped
[SCSI] fix for bidi use after free
[SCSI] fix regression that accidentally disabled block-based tcq
[SCSI] libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu
drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
drm/nouveau/runpm: fix module unload
drm/radeon/px: fix module unload
vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
drm/radeon: don't reset dma on r6xx-evergreen init
drm/radeon: don't reset sdma on CIK init
drm/radeon: don't reset dma on NI/SI init
drm/radeon/dpm: fix resume on mullins
drm/radeon: Disable HDP flush before every CS again for < r600
...
Diffstat (limited to 'drivers/media/dvb-core/dvb-usb-ids.h')
| -rw-r--r-- | drivers/media/dvb-core/dvb-usb-ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h index b7a9b98db414..d484a5158496 100644 --- a/drivers/media/dvb-core/dvb-usb-ids.h +++ b/drivers/media/dvb-core/dvb-usb-ids.h @@ -281,6 +281,8 @@ #define USB_PID_PCTV_400E 0x020f #define USB_PID_PCTV_450E 0x0222 #define USB_PID_PCTV_452E 0x021f +#define USB_PID_PCTV_78E 0x025a +#define USB_PID_PCTV_79E 0x0262 #define USB_PID_REALTEK_RTL2831U 0x2831 #define USB_PID_REALTEK_RTL2832U 0x2832 #define USB_PID_TECHNOTREND_CONNECT_S2_3600 0x3007 |