Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273604
b: refs/heads/master
c: 5f9745b
h: refs/heads/master
v: v3
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent eff32e3 commit f45033c
Show file tree
Hide file tree
Showing 3 changed files with 7 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: e2e02ca48878e78393f09a47918501a3a4b374b4
refs/heads/master: 5f9745b2c942b2ab220831b2c51a18c3f1374249
1 change: 1 addition & 0 deletions trunk/drivers/staging/media/as102/as102_usb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ static int as102_release(struct inode *inode, struct file *file);
static struct usb_device_id as102_usb_id_table[] = {
{ USB_DEVICE(AS102_USB_DEVICE_VENDOR_ID, AS102_USB_DEVICE_PID_0001) },
{ USB_DEVICE(PCTV_74E_USB_VID, PCTV_74E_USB_PID) },
{ USB_DEVICE(ELGATO_EYETV_DTT_USB_VID, ELGATO_EYETV_DTT_USB_PID) },
{ } /* Terminating entry */
};

Expand Down
5 changes: 5 additions & 0 deletions trunk/drivers/staging/media/as102/as102_usb_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
#define PCTV_74E_USB_VID 0x2013
#define PCTV_74E_USB_PID 0x0246

/* Elgato: EyeTV DTT Deluxe */
#define ELGATO_EYETV_DTT_NAME "Elgato EyeTV DTT Deluxe"
#define ELGATO_EYETV_DTT_USB_VID 0x0fd9
#define ELGATO_EYETV_DTT_USB_PID 0x002c

#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
void as102_urb_stream_irq(struct urb *urb, struct pt_regs *regs);
#else
Expand Down

0 comments on commit f45033c

Please sign in to comment.