From patchwork Sat Jan 19 16:33:14 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: 2006961 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AFA82DF2A2 for ; Sat, 19 Jan 2013 16:34:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751970Ab3ASQe3 (ORCPT ); Sat, 19 Jan 2013 11:34:29 -0500 Received: from mail-qc0-f180.google.com ([209.85.216.180]:41759 "EHLO mail-qc0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748Ab3ASQe1 (ORCPT ); Sat, 19 Jan 2013 11:34:27 -0500 Received: by mail-qc0-f180.google.com with SMTP id v28so3072999qcm.11 for ; Sat, 19 Jan 2013 08:34:26 -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=iZkKHfSB0Q3YaPxwT6Glz+tegsAF9QmQrQPZyW08aaU=; b=kaY2Aw+aGX3LEQrX9SAXNqbMZj6TUPfKgHC8RT47FihtVWnl9a4OT6Q/ZGQ+R10cnV T1UX+1a7wabVdjAPWr9Eb/JRmgxDoSl56BcQTA9PG9sXZS4Y6r+BfNoH7BMpMLE6vPE9 /ck+zaHu9U5KP0iBx9HeWnU6K8dCRdzExDHjYay+QL+xrLfpe24Npfz/oLW8JHubLKCv 3EKySn38W46BDcvmI44LqdjohNBYDDps0pcp+G7RGSWUlTjG+njoEgRqO3vaGHcMzo28 /Z39HZEUYHfIUjvYs1joSwNTXWSHb4N0MuXJ7jQF7Q1v13Th5oMRVeKV+4vz7sQmJo6L W+8Q== X-Received: by 10.224.177.72 with SMTP id bh8mr13675616qab.49.1358613266189; Sat, 19 Jan 2013 08:34:26 -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 f7sm5410451qap.13.2013.01.19.08.34.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:25 -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 11/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:14 -0200 Message-Id: <1358613206-4274-11-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358613206-4274-1-git-send-email-peter.senna@gmail.com> References: <1358613206-4274-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 --- 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 };