Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173879
b: refs/heads/master
c: 486ba12
h: refs/heads/master
i:
  173877: f85ef07
  173875: 7e61edb
  173871: e7420bb
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent 5860c90 commit b89d07b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 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: 8a378e8543f044b3e54ddbbb03c349bf054fcedf
refs/heads/master: 486ba12b7ae1edd5549494ae1cbfaa4794d1af5a
9 changes: 8 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/af9015.c
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,7 @@ static struct usb_device_id af9015_usb_table[] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)},
{USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)},
/* 25 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)},
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)},
{0},
};
MODULE_DEVICE_TABLE(usb, af9015_usb_table);
Expand Down Expand Up @@ -1554,7 +1555,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {

.i2c_algo = &af9015_i2c_algo,

.num_device_descs = 4, /* max 9 */
.num_device_descs = 5, /* max 9 */
.devices = {
{
.name = "AverMedia AVerTV Volar GPS 805 (A805)",
Expand All @@ -1577,6 +1578,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.cold_ids = {&af9015_usb_table[24], NULL},
.warm_ids = {NULL},
},
{
.name = "KWorld PlusTV DVB-T PCI Pro Card " \
"(DVB-T PC160-T)",
.cold_ids = {&af9015_usb_table[26], NULL},
.warm_ids = {NULL},
},
}
},
};
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 @@ -116,6 +116,7 @@
#define USB_PID_KWORLD_395U_3 0xe395
#define USB_PID_KWORLD_MC810 0xc810
#define USB_PID_KWORLD_PC160_2T 0xc160
#define USB_PID_KWORLD_PC160_T 0xc161
#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
#define USB_PID_KWORLD_VSTREAM_WARM 0x17df
#define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055
Expand Down

0 comments on commit b89d07b

Please sign in to comment.