From patchwork Thu Mar 22 17:00:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Krufky X-Patchwork-Id: 10450 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SAlNT-0000lP-7S for patchwork@linuxtv.org; Thu, 22 Mar 2012 18:00:43 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1SAlNS-0004Ho-BD; Thu, 22 Mar 2012 18:00:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031017Ab2CVRA1 (ORCPT ); Thu, 22 Mar 2012 13:00:27 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:63140 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031048Ab2CVRAY (ORCPT ); Thu, 22 Mar 2012 13:00:24 -0400 Received: by qcqw6 with SMTP id w6so1439957qcq.19 for ; Thu, 22 Mar 2012 10:00:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-gm-message-state; bh=dt8NqDU66CrY3c1kXF3lciXXyHBL2ZhreUhJJ1A2eDw=; b=fXCXJEMht1UJD5WDdLTnx724Bln//ChtceCn4Kl1KsJjyvIJY13oY7UIQEIddhC32Y GhUchl65JXhM9i2REmaX160Wo12VE+7xb7xY5y/fcd5xxQqfn2uwbTnWrOM9zCzzVV/6 Dn5cUnP1d+ccmdpCNFAzbstcE/jU/4ulcSt+NMOa3C1ml7MmC7WIgNr5psvz6Pl7Vv74 gmq7odzPY4VDB9f6EDdQhrzzlmk/7SHQlqB5YudDbT77+p2ksA0n7kkg5MLqf6UklTAl OTuUARamqmB1XXBd21RhRXTiTX2hTqhi/1ZqRGw5xTOwCVUsRgZ3MLI6bjGEbYqmTvR8 Nk1w== MIME-Version: 1.0 Received: by 10.224.218.10 with SMTP id ho10mr11937525qab.16.1332435621506; Thu, 22 Mar 2012 10:00:21 -0700 (PDT) Received: by 10.229.16.149 with HTTP; Thu, 22 Mar 2012 10:00:21 -0700 (PDT) Date: Thu, 22 Mar 2012 13:00:21 -0400 Message-ID: Subject: [GIT PULL] git://linuxtv.org/mkrufky/hauppauge.git windham-ids From: Michael Krufky To: Mauro Carvalho Chehab Cc: linux-media X-Gm-Message-State: ALoCoQnz6HkV4gpZqahu7b/5HQGXD28qNCUsTniyrHYEVz4sB1ufD2r8cJudz5dJU4rDLgDp3RUr Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.3.22.165132 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' Mauro, Please merge this small patch for a USB ID addition The following changes since commit f92c97c8bd77992ff8bd6ef29a23dc82dca799cb: Mauro Carvalho Chehab (1): [media] update CARDLIST.em28xx are available in the git repository at: git://linuxtv.org/mkrufky/hauppauge.git windham-ids Michael Krufky (1): smsusb: add autodetection support for USB ID 2040:c0a0 drivers/media/dvb/siano/smsusb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 78d6887d1ace284e4c6421b776b7b99a1652599d Author: Michael Krufky Date: Thu Mar 22 12:55:05 2012 -0400 smsusb: add autodetection support for USB ID 2040:c0a0 Signed-off-by: Michael Krufky Cheers, Mike --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index b1fe513..63c004a 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c @@ -542,6 +542,8 @@ static const struct usb_device_id smsusb_id_table[] __devinitconst = { .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, { USB_DEVICE(0x2040, 0xc090), .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0xc0a0), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, { } /* Terminating entry */ };