From patchwork Sat Jan 19 23:41:18 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: 2007541 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 562073FE1F for ; Sat, 19 Jan 2013 23:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752243Ab3ASXmb (ORCPT ); Sat, 19 Jan 2013 18:42:31 -0500 Received: from mail-qc0-f173.google.com ([209.85.216.173]:38511 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752223Ab3ASXm3 (ORCPT ); Sat, 19 Jan 2013 18:42:29 -0500 Received: by mail-qc0-f173.google.com with SMTP id b12so3174332qca.32 for ; Sat, 19 Jan 2013 15:42:28 -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=0wT5ES9AFjuFampWaueRX3va4MLOJHM6hsuDf4IONO4=; b=aexoHGJTqaK8SndBnJV4U0z7tiVtPIP8lZTuNTVB5vvKoaCz1UDZe5pcP5Oni82yOT m7mfeLC3zdgDjbulufIXJFJv1KLZTBdGyXDSwM9j9VoJema3JiQVwxNiGtr7dpaD0/jF tVdqYwfFMfL5N6MsMn9LgSEeUb6a3HMcHD5XzFHzZ+jHzHONJKc/MWzilIiX7XIjSQGu eUyFWs0WnyxxuHNjpi41xhGcpFRLXnXwFGYwvDMQ0FUqPhVv8usY77o5ihpoV1Z2JC2b +h7ghvTaSEpRS171v3uzXD/HJ+Fh8pG+nOxfl0BvrfNUqdZUsmev2GxUi1ZMHUbhATQx ubvw== X-Received: by 10.224.39.139 with SMTP id g11mr14192089qae.35.1358638948138; Sat, 19 Jan 2013 15:42:28 -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.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:27 -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 11/24] gspca/pac7302.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:18 -0200 Message-Id: <1358638891-4775-12-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/pac7302.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c index 4f5869a..add6f72 100644 --- a/drivers/media/usb/gspca/pac7302.c +++ b/drivers/media/usb/gspca/pac7302.c @@ -890,7 +890,7 @@ static int sd_chip_ident(struct gspca_dev *gspca_dev, } #endif -#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) /* interrput packet length */ @@ -936,7 +936,7 @@ static const struct sd_desc sd_desc = { .set_register = sd_dbg_s_register, .get_chip_ident = sd_chip_ident, #endif -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };