Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294888
b: refs/heads/master
c: 260a8f7
h: refs/heads/master
v: v3
  • Loading branch information
Jose Alberto Reguero authored and Mauro Carvalho Chehab committed Feb 8, 2012
1 parent 5f4a128 commit 389a479
Show file tree
Hide file tree
Showing 3 changed files with 4 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: 23268ae5f0447316101ff320ac89d5ee8a0b5f70
refs/heads/master: 260a8f7b06c9f8fba20bea7cd76281a533241076
3 changes: 2 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/az6007.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ static int az6007_usb_probe(struct usb_interface *intf,
static struct usb_device_id az6007_usb_table[] = {
{USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_6007)},
{USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7)},
{USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7_2)},
{0},
};

Expand Down Expand Up @@ -534,7 +535,7 @@ static struct dvb_usb_device_properties az6007_properties = {
.warm_ids = { NULL },
},
{ .name = "TerraTec DTV StarBox DVB-T/C USB2.0 (az6007)",
.cold_ids = { &az6007_usb_table[1], NULL },
.cold_ids = { &az6007_usb_table[1], &az6007_usb_table[2], NULL },
.warm_ids = { NULL },
},
{ 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 @@ -228,6 +228,7 @@
#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078
#define USB_PID_TERRATEC_CINERGY_T_XXS_2 0x00ab
#define USB_PID_TERRATEC_H7 0x10b4
#define USB_PID_TERRATEC_H7_2 0x10a3
#define USB_PID_TERRATEC_T3 0x10a0
#define USB_PID_TERRATEC_T5 0x10a1
#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
Expand Down

0 comments on commit 389a479

Please sign in to comment.