From patchwork Sat Jan 19 23:41:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 2007451 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CE11B3FED4 for ; Sat, 19 Jan 2013 23:42:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751556Ab3ASXl6 (ORCPT ); Sat, 19 Jan 2013 18:41:58 -0500 Received: from mail-qa0-f51.google.com ([209.85.216.51]:44357 "EHLO mail-qa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152Ab3ASXl5 (ORCPT ); Sat, 19 Jan 2013 18:41:57 -0500 Received: by mail-qa0-f51.google.com with SMTP id i20so3902423qad.10 for ; Sat, 19 Jan 2013 15:41:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=CYuJjTMwfUdsZQUxqTaxmOfd1Tj8lmO8QFNpk3miTW4=; b=h0abkYv8hc+girzRRq972DlfEPFuaX3ZU1hUypyuBXRALK11JlkibN5l8nHZEo4Jsm KLEKIM8zBdqtW20yi/8yBmQPizKWhbraU6i1KChJIVHkPK1p+e4g+32RrQhAPkl0i+7o 905UCMfLT7kyDiZcqjlyUBlvN4m1sbbzroxE6Xt3jutI7acMm/IaTr+x90niBvyJeBPo 57RmaX9FbFsEwtKAuae29e4kR/nH7DaDCiqtQeInd/Ww0aHM7aPoz4wtKlG5oBjUIdqV XGYDOb1ixPGk4N6bv8RTHAH4OMlhwNVJttMfyH/eYwutcZ8Qz/tFPmsVs3ZNM7pBp2A2 FMeA== X-Received: by 10.224.17.198 with SMTP id t6mr14805857qaa.84.1358638916758; Sat, 19 Jan 2013 15:41:56 -0800 (PST) Received: from ace.home.cabure.org (200-140-13-6.bsace705.dsl.brasiltelecom.net.br. [200.140.13.6]) by mx.google.com with ESMTPS id y1sm6058595qan.22.2013.01.19.15.41.53 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:41:56 -0800 (PST) From: Peter Senna Tschudin To: mchehab@redhat.com Cc: remi.schwartz@gmail.com, sean@mess.org, kyle@kyle.strickland.name, simon.farnsworth@onelan.co.uk, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH V2 02/24] pci/saa7134/saa7134.h: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:09 -0200 Message-Id: <1358638891-4775-3-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358638891-4775-1-git-send-email-peter.senna@gmail.com> References: <1358638891-4775-1-git-send-email-peter.senna@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org replace: #if defined(CONFIG_VIDEO_SAA7134_DVB) || \ defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) with: #if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) This change was made for: CONFIG_VIDEO_SAA7134_DVB Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- Changes from V1: Updated subject drivers/media/pci/saa7134/saa7134.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 0a3feaa..ace44fd 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -42,7 +42,7 @@ #include #include #include -#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) #include #endif @@ -644,7 +644,7 @@ struct saa7134_dev { struct work_struct empress_workqueue; int empress_started; -#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) /* SAA7134_MPEG_DVB only */ struct videobuf_dvb_frontends frontends; int (*original_demod_sleep)(struct dvb_frontend *fe);