diff --git a/[refs] b/[refs] index 76ad3d7552bb..d56bba26e881 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1ed02e9f1a0fa34e5b5e978209204033bb9cf4f +refs/heads/master: dd7aaa4d9d97a8571bcfa498e90b9daf540db1cf diff --git a/trunk/drivers/staging/media/as102/as102_usb_drv.c b/trunk/drivers/staging/media/as102/as102_usb_drv.c index 9faab5b50045..7bcb28cdbabe 100644 --- a/trunk/drivers/staging/media/as102/as102_usb_drv.c +++ b/trunk/drivers/staging/media/as102/as102_usb_drv.c @@ -42,6 +42,7 @@ static struct usb_device_id as102_usb_id_table[] = { { USB_DEVICE(PCTV_74E_USB_VID, PCTV_74E_USB_PID) }, { USB_DEVICE(ELGATO_EYETV_DTT_USB_VID, ELGATO_EYETV_DTT_USB_PID) }, { USB_DEVICE(NBOX_DVBT_DONGLE_USB_VID, NBOX_DVBT_DONGLE_USB_PID) }, + { USB_DEVICE(SKY_IT_DIGITAL_KEY_USB_VID, SKY_IT_DIGITAL_KEY_USB_PID) }, { } /* Terminating entry */ }; @@ -52,6 +53,7 @@ static const char * const as102_device_names[] = { AS102_PCTV_74E, AS102_ELGATO_EYETV_DTT_NAME, AS102_NBOX_DVBT_DONGLE_NAME, + AS102_SKY_IT_DIGITAL_KEY_NAME, NULL /* Terminating entry */ }; diff --git a/trunk/drivers/staging/media/as102/as102_usb_drv.h b/trunk/drivers/staging/media/as102/as102_usb_drv.h index 35925b7c1b25..fc2884ab02a2 100644 --- a/trunk/drivers/staging/media/as102/as102_usb_drv.h +++ b/trunk/drivers/staging/media/as102/as102_usb_drv.h @@ -47,6 +47,11 @@ #define NBOX_DVBT_DONGLE_USB_VID 0x0b89 #define NBOX_DVBT_DONGLE_USB_PID 0x0007 +/* Sky Italia: Digital Key (green led) */ +#define AS102_SKY_IT_DIGITAL_KEY_NAME "Sky IT Digital Key (green led)" +#define SKY_IT_DIGITAL_KEY_USB_VID 0x2137 +#define SKY_IT_DIGITAL_KEY_USB_PID 0x0001 + void as102_urb_stream_irq(struct urb *urb); struct as10x_usb_token_cmd_t {