From patchwork Fri Dec 16 18:54:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Figg X-Patchwork-Id: 131886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 18DD01007DC for ; Sat, 17 Dec 2011 05:54:42 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RbcvJ-0006gV-Bb; Fri, 16 Dec 2011 18:54:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RbcvH-0006gL-IJ for kernel-team@lists.ubuntu.com; Fri, 16 Dec 2011 18:54:23 +0000 Received: from static-50-53-107-235.bvtn.or.frontiernet.net ([50.53.107.235] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RbcvH-0006vJ-6u for kernel-team@lists.ubuntu.com; Fri, 16 Dec 2011 18:54:23 +0000 From: Brad Figg To: kernel-team@lists.ubuntu.com Subject: [natty] [oneiric] [PATCH 1/1] [media] Support for Terratec G1 Date: Fri, 16 Dec 2011 10:54:14 -0800 Message-Id: <1324061654-3880-2-git-send-email-brad.figg@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1324061654-3880-1-git-send-email-brad.figg@canonical.com> References: <1324061654-3880-1-git-send-email-brad.figg@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Teka 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 (cherry picked from commit efabaaf38a6cac929650943151e679f2b5cdae8b) Signed-off-by: Brad Figg Acked-by: Seth Forshee --- 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),