From patchwork Sat Jan 19 23:41:19 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: 2007551 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 F14623FE1F for ; Sat, 19 Jan 2013 23:42:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752262Ab3ASXme (ORCPT ); Sat, 19 Jan 2013 18:42:34 -0500 Received: from mail-qa0-f49.google.com ([209.85.216.49]:39756 "EHLO mail-qa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240Ab3ASXmb (ORCPT ); Sat, 19 Jan 2013 18:42:31 -0500 Received: by mail-qa0-f49.google.com with SMTP id r4so3854715qaq.8 for ; Sat, 19 Jan 2013 15:42:30 -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=32ljQRE5ec1Lk+EsnMqYyg0v/VN7x7OMsoZV2oVdgMw=; b=p3xrTqLyg3MfeP1q09H+p4DzfKGh2oxJErL6xPnavgVIGAvmTUlWAcjFD+xy+cwhhW fVyxyZ9FbVIC80X3ztzbDeqHB+GutAfdiLZQBvG+MsZi0d3N8A9b9cNkCGpl02FHymaY GrHnHOE5HXbi1JOgcCP+F8PGwaFvUT0w2deGI96f5BFiobIzt5iuXXuNcjch0UQzB4TP cEOjYIn8FzcJRkQW+eGocxQStobQ8lZCTVZpfbVGlUcBxRNPquNP1og4kbm0YjG1+SC3 +7yMT7MkP9YYbOL1Pw0LawCBBQMc76btj+rk2FBacn0h5pycrFDYW8Gl0xjenAwFGDHV qFmg== X-Received: by 10.49.127.15 with SMTP id nc15mr16684803qeb.61.1358638950711; Sat, 19 Jan 2013 15:42:30 -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.42.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:30 -0800 (PST) From: Peter Senna Tschudin To: hdegoede@redhat.com Cc: mchehab@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH V2 12/24] usb/gspca/pac7311.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:19 -0200 Message-Id: <1358638891-4775-13-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_INPUT) || \ defined(CONFIG_INPUT_MODULE) with: #if IS_ENABLED(CONFIG_INPUT) This change was made for: CONFIG_INPUT Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- Changes from V1: Updated subject drivers/media/usb/gspca/pac7311.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c index ba3558d..a12dfbf 100644 --- a/drivers/media/usb/gspca/pac7311.c +++ b/drivers/media/usb/gspca/pac7311.c @@ -621,7 +621,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, gspca_frame_add(gspca_dev, INTER_PACKET, data, len); } -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, /* interrupt packet data */ int len) /* interrupt packet length */ @@ -661,7 +661,7 @@ static const struct sd_desc sd_desc = { .stopN = sd_stopN, .pkt_scan = sd_pkt_scan, .dq_callback = do_autogain, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };