diff options
| -rw-r--r-- | README.patches | 16 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 |
3 files changed, 17 insertions, 10 deletions
diff --git a/README.patches b/README.patches index 4634b8b99..931c15960 100644 --- a/README.patches +++ b/README.patches @@ -58,7 +58,7 @@ The main kernel trees is owned by Linus Torvalds, being located at: The subsystem master tree is owned by the subsystem maintainer (Mauro Carvalho Chehab) being located at: http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-2.6.git -A tree with development patches that aren't ready yet for upstream is +A tree with development patches that aren't ready yet for upstream is handled at: http://git.kernel.org/?p=linux/kernel/git/mchehab/devel.git @@ -165,16 +165,16 @@ b) All commits at mercurial trees should have a consistent message, From: line shouldn't be omitted, since it will be used for the patch author when converting to -git. - Priority: meta-tag will be used as a hint to the subsystem maintainer, to help him to - identify if the patch is an improvement or board addition ("normal"), that will follow - the normal lifecycle of a patch (e.g. will be sent upstream on the next merge tree), if + Priority: meta-tag will be used as a hint to the subsystem maintainer, to help him to + identify if the patch is an improvement or board addition ("normal"), that will follow + the normal lifecycle of a patch (e.g. will be sent upstream on the next merge tree), if the patch is a bug fix tree for a while without merging upstream ("low"). Valid values for "Priority:" are "low", "normal" and "high". -c) All patches are requested to have their coding style validated by using - script/checkpatch.pl. This check runs automatically by using "make commit". By default, - it will try to use the newest version of the script, between the kernel one and a copy +c) All patches are requested to have their coding style validated by using + script/checkpatch.pl. This check runs automatically by using "make commit". By default, + it will try to use the newest version of the script, between the kernel one and a copy at v4l-dvb development tree. It is always a good idea to use in-kernel version, since additional tests @@ -481,7 +481,7 @@ a. Post your patches to the corresponding mailing list for review and linux-media@vger.kernel.org This mailing list doesn't require subscription, although - it is recommended to subscribe, expecially if you're + it is recommended to subscribe, expecially if you're developing V4L/DVB drivers. b. Use [PATCH] and a brief description in the email's subject. diff --git a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c index 391732788..5e837668f 100644 --- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -1393,6 +1393,7 @@ struct usb_device_id dib0700_usb_id_table[] = { { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) }, /* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) }, { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) }, + { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_EXPRESS) }, { 0 } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); @@ -1537,7 +1538,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { { "DiBcom STK7700D reference design", { &dib0700_usb_id_table[14], NULL }, { NULL }, - } + }, + }, .rc_interval = DEFAULT_RC_INTERVAL, @@ -1557,7 +1559,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { }, }, - .num_device_descs = 2, + .num_device_descs = 3, .devices = { { "ASUS My Cinema U3000 Mini DVBT Tuner", { &dib0700_usb_id_table[23], NULL }, @@ -1566,6 +1568,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { { "Yuan EC372S", { &dib0700_usb_id_table[31], NULL }, { NULL }, + }, + { "Terratec Cinergy T Express", + { &dib0700_usb_id_table[42], NULL }, + { NULL }, } }, diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index a4fca3fca..2c6f4be05 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -164,6 +164,7 @@ #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a #define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 #define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 +#define USB_PID_TERRATEC_CINERGY_T_EXPRESS 0x0062 #define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e #define USB_PID_PINNACLE_PCTV2000E 0x022c |