From patchwork Tue May 19 15:24:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uri Shkolnik X-Patchwork-Id: 24744 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4JFO9PQ003434 for ; Tue, 19 May 2009 15:24:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751696AbZESPYE (ORCPT ); Tue, 19 May 2009 11:24:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751782AbZESPYE (ORCPT ); Tue, 19 May 2009 11:24:04 -0400 Received: from web110815.mail.gq1.yahoo.com ([67.195.13.238]:44415 "HELO web110815.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751696AbZESPYD (ORCPT ); Tue, 19 May 2009 11:24:03 -0400 Received: (qmail 99814 invoked by uid 60001); 19 May 2009 15:24:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1242746643; bh=7lDy98FCA1E8BvftdgLKZ1PKwJDMemD24dv93h8fo2A=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=YVjBB+UxM1pXTxv2HWNOUGVPXmhnQZr4mlbmlxyvPmmyjJVVr0gDeb03EA0E6HmO0adAaXF3btzc+Df7ndIBvFGynNxKc1nPlixZckgO5PnwMIsPR8Q4wv2JAg/Q0QMsGvS13hC++apindEhsUJwEjmVI93vRiGDL+v5yFxK+Kc= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=Z48rUOkjugwv3obeEA1PbtlBInLDQk20pYRXXGSzJHnT/8fiGkxBgoFa19p1JE0lAwGqQyktPXxzxxvBBVVOZqOqCEdHSRhVG/KHVuEF//hg/NEt8C1o8VxwWsAp0dS0ZRiq8xLRmLmPNgHzF/g7PbuDlUod9wKSiacbubR/EUs=; Message-ID: <573374.98762.qm@web110815.mail.gq1.yahoo.com> X-YMail-OSG: uR4IPd0VM1mDRalyBeo6Gp2M3.El2lrNyALK0f2wPPcP_XvUE33jTvaWfZWX1f.vp66bA6wBHUXiqyd6g2GHMqScKIwdfgsJAmz1Qzl_I3UymJ5HnFq7KeGunqeCMgM_PP1Tlkm04SaRzsOcB57kQHLSCYKEfPwaVKamRtjRE9eNErTEsBhuj.Pjap52FSYjSMfj.NUWx08sBB4wrJw2ITppmWmBk7UqqL7ymIBkR5PNjIUTkVnukMzYR0Tu_JZwIhUXIq314O_J67011Gl459epjxYic_EbQwuZcjj0M9qYSwgPHh2oZOb.ahfQ.MZZJ7_efsqN.Tkht6.CaWTbOBucCdfi0Y0NH0u3Xe8G2PWgAuG2TJquedNlBw-- Received: from [199.203.99.233] by web110815.mail.gq1.yahoo.com via HTTP; Tue, 19 May 2009 08:24:03 PDT X-Mailer: YahooMailClassic/5.3.9 YahooMailWebService/0.7.289.10 Date: Tue, 19 May 2009 08:24:03 -0700 (PDT) From: Uri Shkolnik Subject: [PATCH] [09051_46] Siano: smsusb - remove redundant ifdef To: LinuxML MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org # HG changeset patch # User Uri Shkolnik # Date 1242746858 -10800 # Node ID 98895daafb42f8b0757fd608b29c53c80327520e # Parent 37df2d513a68b920ba4ceed0220cf6915d2d574e [09051_46] Siano: smsusb - remove redundant ifdef From: Uri Shkolnik Remove a redundant ifdef Priority: normal Signed-off-by: Uri Shkolnik --- 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 -r 37df2d513a68 -r 98895daafb42 linux/drivers/media/dvb/siano/smsusb.c --- a/linux/drivers/media/dvb/siano/smsusb.c Tue May 19 18:23:41 2009 +0300 +++ b/linux/drivers/media/dvb/siano/smsusb.c Tue May 19 18:27:38 2009 +0300 @@ -489,7 +489,6 @@ static int smsusb_resume(struct usb_inte } struct usb_device_id smsusb_id_table[] = { -#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS { USB_DEVICE(0x187f, 0x0010), .driver_info = SMS1XXX_BOARD_SIANO_STELLAR }, { USB_DEVICE(0x187f, 0x0100), @@ -500,7 +499,6 @@ struct usb_device_id smsusb_id_table[] = .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B }, { USB_DEVICE(0x187f, 0x0300), .driver_info = SMS1XXX_BOARD_SIANO_VEGA }, -#endif { USB_DEVICE(0x2040, 0x1700), .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT }, { USB_DEVICE(0x2040, 0x1800),