Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 138054
b: refs/heads/master
c: 9abb6e6
h: refs/heads/master
v: v3
  • Loading branch information
Pascal Terjan authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 09b7615 commit 2deead8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0a6e1ed2f11d92e24c3792ce5403e2628a9f7a7e
refs/heads/master: 9abb6e6f5942885b7ca387a41e55e645732d63bc
7 changes: 6 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -1420,6 +1420,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
{ 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);
Expand Down Expand Up @@ -1619,7 +1620,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
},
},

.num_device_descs = 9,
.num_device_descs = 10,
.devices = {
{ "DiBcom STK7070P reference design",
{ &dib0700_usb_id_table[15], NULL },
Expand Down Expand Up @@ -1657,6 +1658,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
{ &dib0700_usb_id_table[33], NULL },
{ NULL },
},
{ "Yuan PD378S",
{ &dib0700_usb_id_table[45], NULL },
{ NULL },
},
},

.rc_interval = DEFAULT_RC_INTERVAL,
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/dvb-usb/dvb-usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,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];
};

/**
Expand Down

0 comments on commit 2deead8

Please sign in to comment.