Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295036
b: refs/heads/master
c: 9d17600
h: refs/heads/master
v: v3
  • Loading branch information
Paolo Pantò authored and Mauro Carvalho Chehab committed Mar 8, 2012
1 parent 5d9d7b2 commit 26fff54
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3907b019971fdd626b4740664b6bc7ecdedeec54
refs/heads/master: 9d1760059f29f91ad24cb2dcf75ed2b3f5198dcb
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 @@ -128,6 +128,7 @@
#define USB_PID_E3C_EC168_4 0x1001
#define USB_PID_E3C_EC168_5 0x1002
#define USB_PID_FREECOM_DVBT 0x0160
#define USB_PID_FREECOM_DVBT_2 0x0161
#define USB_PID_UNIWILL_STK7700P 0x6003
#define USB_PID_GENIUS_TVGO_DVB_T03 0x4012
#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0
Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/media/dvb/dvb-usb/rtl28xxu.c
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,7 @@ static int rtl2832u_rc_query(struct dvb_usb_device *d)
enum rtl28xxu_usb_table_entry {
RTL2831U_0BDA_2831,
RTL2831U_14AA_0160,
RTL2831U_14AA_0161,
};

static struct usb_device_id rtl28xxu_table[] = {
Expand All @@ -775,6 +776,8 @@ static struct usb_device_id rtl28xxu_table[] = {
USB_DEVICE(USB_VID_REALTEK, USB_PID_REALTEK_RTL2831U)},
[RTL2831U_14AA_0160] = {
USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT)},
[RTL2831U_14AA_0161] = {
USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT_2)},

/* RTL2832U */
{} /* terminating entry */
Expand Down Expand Up @@ -840,6 +843,7 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {
.name = "Freecom USB2.0 DVB-T",
.warm_ids = {
&rtl28xxu_table[RTL2831U_14AA_0160],
&rtl28xxu_table[RTL2831U_14AA_0161],
},
},
}
Expand Down

0 comments on commit 26fff54

Please sign in to comment.