From patchwork Sun Oct 31 12:57:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Bourdin X-Patchwork-Id: 293502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9VD7l04017958 for ; Sun, 31 Oct 2010 13:07:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755685Ab0JaNHo (ORCPT ); Sun, 31 Oct 2010 09:07:44 -0400 Received: from vbox10718.hkn.net ([213.9.107.18]:46201 "EHLO mail.pab-software.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755639Ab0JaNHo (ORCPT ); Sun, 31 Oct 2010 09:07:44 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 31 Oct 2010 13:07:47 +0000 (UTC) X-Greylist: delayed 583 seconds by postgrey-1.27 at vger.kernel.org; Sun, 31 Oct 2010 09:07:43 EDT Received: from [192.168.2.101] (dslb-088-071-137-037.pools.arcor-ip.net [88.71.137.37]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.pab-software.de (Postfix) with ESMTPSA id DB51652EEB88 for ; Sun, 31 Oct 2010 13:59:31 +0100 (CET) Subject: Terratec Cinergy Hybrid T USB XS From: Philippe Bourdin To: linux-media Date: Sun, 31 Oct 2010 13:57:58 +0100 Message-ID: <1288529878.1858.16.camel@andromeda> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org --- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-cards.c 2010-07-11 16:27:35.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-cards.c 2010-07-10 17:18:42.000000000 +0200 @@ -1494,7 +1494,7 @@ } }, }, [EM2882_BOARD_TERRATEC_HYBRID_XS] = { - .name = "Terratec Hybrid XS (em2882)", + .name = "Terratec Cinnergy Hybrid T USB XS (em2882)", .tuner_type = TUNER_XC2028, .tuner_gpio = default_tuner_gpio, .mts_firmware = 1, @@ -1794,7 +1794,7 @@ { USB_DEVICE(0x0ccd, 0x005e), .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS }, { USB_DEVICE(0x0ccd, 0x0042), - .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, + .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS }, { USB_DEVICE(0x0ccd, 0x0043), .driver_info = EM2870_BOARD_TERRATEC_XS }, { USB_DEVICE(0x0ccd, 0x0047),