Message ID | 1324061654-3880-2-git-send-email-brad.figg@canonical.com |
---|---|
State | New |
Headers | show |
On 12/16/2011 11:54 AM, Brad Figg wrote: > From: Teka<teka101@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/821061 > > Hi, > > This is a little patch to support Terratec G1 (based on Terratec Grabby). > > It works perfectly on my pc (Ubuntu 11.04 / Kernel 2.6.38). > > Best regards, > > Signed-off-by: Mauro Carvalho Chehab<mchehab@redhat.com> > (cherry picked from commit efabaaf38a6cac929650943151e679f2b5cdae8b) > > Signed-off-by: Brad Figg<brad.figg@canonical.com> > --- > drivers/media/video/em28xx/em28xx-cards.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c > index 87f77a3..e25c107 100644 > --- a/drivers/media/video/em28xx/em28xx-cards.c > +++ b/drivers/media/video/em28xx/em28xx-cards.c > @@ -1830,6 +1830,8 @@ struct usb_device_id em28xx_id_table[] = { > .driver_info = EM2860_BOARD_TERRATEC_AV350 }, > { USB_DEVICE(0x0ccd, 0x0096), > .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, > + { USB_DEVICE(0x0ccd, 0x10AF), > + .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, > { USB_DEVICE(0x0fd9, 0x0033), > .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE}, > { USB_DEVICE(0x185b, 0x2870),
On Fri, Dec 16, 2011 at 10:54:14AM -0800, Brad Figg wrote: > From: Teka <teka101@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/821061 > > Hi, > > This is a little patch to support Terratec G1 (based on Terratec Grabby). > > It works perfectly on my pc (Ubuntu 11.04 / Kernel 2.6.38). > > Best regards, > > Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> > (cherry picked from commit efabaaf38a6cac929650943151e679f2b5cdae8b) > > Signed-off-by: Brad Figg <brad.figg@canonical.com> Clean cherry-pick and little risk of regression. Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 12/16/2011 11:54 AM, Brad Figg wrote: > From: Teka<teka101@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/821061 > > Hi, > > This is a little patch to support Terratec G1 (based on Terratec Grabby). > > It works perfectly on my pc (Ubuntu 11.04 / Kernel 2.6.38). > > Best regards, > > Signed-off-by: Mauro Carvalho Chehab<mchehab@redhat.com> > (cherry picked from commit efabaaf38a6cac929650943151e679f2b5cdae8b) > > Signed-off-by: Brad Figg<brad.figg@canonical.com> > --- > drivers/media/video/em28xx/em28xx-cards.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c > index 87f77a3..e25c107 100644 > --- a/drivers/media/video/em28xx/em28xx-cards.c > +++ b/drivers/media/video/em28xx/em28xx-cards.c > @@ -1830,6 +1830,8 @@ struct usb_device_id em28xx_id_table[] = { > .driver_info = EM2860_BOARD_TERRATEC_AV350 }, > { USB_DEVICE(0x0ccd, 0x0096), > .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, > + { USB_DEVICE(0x0ccd, 0x10AF), > + .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, > { USB_DEVICE(0x0fd9, 0x0033), > .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE}, > { USB_DEVICE(0x185b, 0x2870),
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 87f77a3..e25c107 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -1830,6 +1830,8 @@ struct usb_device_id em28xx_id_table[] = { .driver_info = EM2860_BOARD_TERRATEC_AV350 }, { USB_DEVICE(0x0ccd, 0x0096), .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, + { USB_DEVICE(0x0ccd, 0x10AF), + .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, { USB_DEVICE(0x0fd9, 0x0033), .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE}, { USB_DEVICE(0x185b, 0x2870),