Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4333
b: refs/heads/master
c: 68293dd
h: refs/heads/master
i:
  4331: e3fe2e3
v: v3
  • Loading branch information
Johannes Stezenbach authored and Linus Torvalds committed Jul 8, 2005
1 parent d5b172f commit 8caf9d0
Show file tree
Hide file tree
Showing 2 changed files with 17 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: 53936391741dee735304e997e2289500adf970c7
refs/heads/master: 68293ddbabb26a58ddb0a84aa5058a7acd7127e7
16 changes: 16 additions & 0 deletions trunk/drivers/media/dvb/dvb-usb/dibusb-mb.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_COLD) },
/* 24 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_WARM) },

// #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs

#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
/* 25 */ { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
#endif
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);
Expand Down Expand Up @@ -228,12 +234,22 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
}
},

#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
.num_device_descs = 2,
#else
.num_device_descs = 1,
#endif
.devices = {
{ "Artec T1 USB1.1 TVBOX with AN2235",
{ &dibusb_dib3000mb_table[20], NULL },
{ &dibusb_dib3000mb_table[21], NULL },
},
#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
{ "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)",
{ &dibusb_dib3000mb_table[25], NULL },
{ NULL },
},
#endif
}
};

Expand Down

0 comments on commit 8caf9d0

Please sign in to comment.