Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61279
b: refs/heads/master
c: 4919c49
h: refs/heads/master
i:
  61277: 1d3dce9
  61275: b1df0ce
  61271: 8deaf68
  61263: 69b8909
  61247: e5b437f
v: v3
  • Loading branch information
Aapo Tahkola authored and Mauro Carvalho Chehab committed Jul 18, 2007
1 parent f6b55f1 commit d743368
Show file tree
Hide file tree
Showing 3 changed files with 9 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: e62a42090cdeaa6bbd3d22fa25309592c5eebbbd
refs/heads/master: 4919c49278b3299c1373912dec9c3d9cf27ec56d
2 changes: 2 additions & 0 deletions trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define USB_VID_ADSTECH 0x06e1
#define USB_VID_AFATECH 0x15a4
#define USB_VID_ALCOR_MICRO 0x058f
#define USB_VID_ALINK 0x05e3
#define USB_VID_ANCHOR 0x0547
#define USB_VID_ANUBIS_ELECTRONIC 0x10fd
#define USB_VID_AVERMEDIA 0x07ca
Expand Down Expand Up @@ -47,6 +48,7 @@
#define USB_PID_ADSTECH_USB2_COLD 0xa333
#define USB_PID_ADSTECH_USB2_WARM 0xa334
#define USB_PID_AFATECH_AF9005 0x9020
#define USB_VID_ALINK_DTU 0xf170
#define USB_PID_AVERMEDIA_DVBT_USB_COLD 0x0001
#define USB_PID_AVERMEDIA_DVBT_USB_WARM 0x0002
#define USB_PID_AVERMEDIA_DVBT_USB2_COLD 0xa800
Expand Down
7 changes: 6 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/gl861.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ static int gl861_probe(struct usb_interface *intf,

static struct usb_device_id gl861_table [] = {
{ USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580_55801) },
{ USB_DEVICE(USB_VID_ALINK, USB_VID_ALINK_DTU) },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE (usb, gl861_table);
Expand Down Expand Up @@ -187,12 +188,16 @@ static struct dvb_usb_device_properties gl861_properties = {
}},
.i2c_algo = &gl861_i2c_algo,

.num_device_descs = 1,
.num_device_descs = 2,
.devices = {
{ "MSI Mega Sky 55801 DVB-T USB2.0",
{ &gl861_table[0], NULL },
{ NULL },
},
{ "A-LINK DTU DVB-T USB2.0",
{ &gl861_table[1], NULL },
{ NULL },
},
}
};

Expand Down

0 comments on commit d743368

Please sign in to comment.