The patch number 10825 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        Linux Media Mailing List <linux-me...@vger.kernel.org>

------

From: Pascal Terjan  <pter...@mandriva.com>
Add ids for Yuan PD378S DVB adapter


Signed-off-by: Arnaud Patard <apat...@mandriva.com>
Signed-off-by: Pascal Terjan <pter...@mandriva.com>
CC: Patrick Boettcher <patrick.boettc...@desy.de>
[mche...@redhat.com: Fixed a small merge conflict]
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>


---

 linux/drivers/media/dvb/dvb-usb/dib0700_devices.c |    7 ++++++-
 linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h     |    1 +
 linux/drivers/media/dvb/dvb-usb/dvb-usb.h         |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff -r 6f06ffa0487c -r 849f348d89cb 
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
--- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Tue Feb 24 17:51:43 
2009 +0000
+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Thu Feb 26 13:31:41 
2009 +0000
@@ -1420,6 +1420,7 @@ struct usb_device_id dib0700_usb_id_tabl
        { USB_DEVICE(USB_VID_TERRATEC,
                        USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2) },
        { USB_DEVICE(USB_VID_SONY,      USB_PID_SONY_PLAYTV) },
+/* 45 */{ USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_PD378S) },
        { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1619,7 +1620,7 @@ struct dvb_usb_device_properties dib0700
                        },
                },
 
-               .num_device_descs = 9,
+               .num_device_descs = 10,
                .devices = {
                        {   "DiBcom STK7070P reference design",
                                { &dib0700_usb_id_table[15], NULL },
@@ -1655,6 +1656,10 @@ struct dvb_usb_device_properties dib0700
                        },
                        {   "Terratec Cinergy T USB XXS",
                                { &dib0700_usb_id_table[33], NULL },
+                               { NULL },
+                       },
+                       {   "Yuan PD378S",
+                               { &dib0700_usb_id_table[44], NULL },
                                { NULL },
                        },
                },
diff -r 6f06ffa0487c -r 849f348d89cb 
linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h     Tue Feb 24 17:51:43 
2009 +0000
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h     Thu Feb 26 13:31:41 
2009 +0000
@@ -234,6 +234,7 @@
 #define USB_PID_ASUS_U3100                             0x173f
 #define USB_PID_YUAN_EC372S                            0x1edc
 #define USB_PID_YUAN_STK7700PH                         0x1f08
+#define USB_PID_YUAN_PD378S                            0x2edc
 #define USB_PID_DW2102                                 0x2102
 #define USB_PID_XTENSIONS_XD_380                       0x0381
 #define USB_PID_TELESTAR_STARSTICK_2                   0x8000
diff -r 6f06ffa0487c -r 849f348d89cb linux/drivers/media/dvb/dvb-usb/dvb-usb.h
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h Tue Feb 24 17:51:43 2009 +0000
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h Thu Feb 26 13:31:41 2009 +0000
@@ -224,7 +224,7 @@ struct dvb_usb_device_properties {
        int generic_bulk_ctrl_endpoint;
 
        int num_device_descs;
-       struct dvb_usb_device_description devices[9];
+       struct dvb_usb_device_description devices[10];
 };
 
 /**


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/849f348d89cbb622ffba7840d69e78e1f14f5233

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to