Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306107
b: refs/heads/master
c: 728827b
h: refs/heads/master
i:
  306105: df666c2
  306103: 3773122
v: v3
  • Loading branch information
Gianluca Gennari authored and Mauro Carvalho Chehab committed Apr 9, 2012
1 parent db75bb9 commit 29bfddc
Show file tree
Hide file tree
Showing 3 changed files with 7 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: 540fd4ba053356cca91429cf4f6bf25fabd2984a
refs/heads/master: 728827b8d32319a2989f89b656e2d9fc6d7a3ab3
6 changes: 5 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/af9035.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ enum af9035_id_entry {
AF9035_15A4_9035,
AF9035_15A4_1001,
AF9035_07CA_1867,
AF9035_07CA_A867,
};

static struct usb_device_id af9035_id[] = {
Expand All @@ -805,6 +806,8 @@ static struct usb_device_id af9035_id[] = {
USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},
[AF9035_07CA_1867] = {
USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_1867)},
[AF9035_07CA_A867] = {
USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A867)},
{},
};

Expand Down Expand Up @@ -861,9 +864,10 @@ static struct dvb_usb_device_properties af9035_properties[] = {
&af9035_id[AF9035_15A4_1001],
},
}, {
.name = "AVerMedia HD Volar",
.name = "AVerMedia HD Volar (A867)",
.cold_ids = {
&af9035_id[AF9035_07CA_1867],
&af9035_id[AF9035_07CA_A867],
},
},
}
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 @@ -225,6 +225,7 @@
#define USB_PID_AVERMEDIA_A805 0xa805
#define USB_PID_AVERMEDIA_A815M 0x815a
#define USB_PID_AVERMEDIA_1867 0x1867
#define USB_PID_AVERMEDIA_A867 0xa867
#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006
#define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d
#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a
Expand Down

0 comments on commit 29bfddc

Please sign in to comment.