From patchwork Sat Jan 19 16:33:23 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: 2007031 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 92717DF2A2 for ; Sat, 19 Jan 2013 16:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752042Ab3ASQey (ORCPT ); Sat, 19 Jan 2013 11:34:54 -0500 Received: from mail-qa0-f49.google.com ([209.85.216.49]:51227 "EHLO mail-qa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040Ab3ASQew (ORCPT ); Sat, 19 Jan 2013 11:34:52 -0500 Received: by mail-qa0-f49.google.com with SMTP id r4so3732081qaq.8 for ; Sat, 19 Jan 2013 08:34:52 -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=pW5EdELQ4QV4lxlCfl+QQhzoquK2O52lyzVzHBpinEA=; b=KxDl9mVLBtug1TJeBCiihwMg6dFaRm+mopNPUzN1VWG8ER8MInkHf1qwFMPEKaAQn7 mD1wKFr68TSzAkIYjp90gxt5ntB2CUaHgxO0mI0G4e05/sF7RX60J+6t7IrghBGlNnJS +NXnxSUQmSzyQOp1ptRQhDP3bUPH7hPfwcjSL6NWz9MeMen1mpjXyvT69tsaqozVFar0 MfNHxm+8iNBnZRltVR3j+OCXMu2j0Ka5IxbxWCpFRF4Xp4Xn8r/0nnSTAt0GbxAoFySW k1OUNnqiC2hR7fCLx6pyUTSqwANQTGjviAwwIBKqQ7Rq737Kj7KZpmUUKso7MDZj7HYO H0tA== X-Received: by 10.224.72.197 with SMTP id n5mr13880876qaj.38.1358613292065; Sat, 19 Jan 2013 08:34:52 -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.49 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:51 -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 21/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:23 -0200 Message-Id: <1358613206-4274-20-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/zc3xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c index 77c5775..a8dc421 100644 --- a/drivers/media/usb/gspca/zc3xx.c +++ b/drivers/media/usb/gspca/zc3xx.c @@ -6902,7 +6902,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev, return 0; } -#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 */ @@ -6929,7 +6929,7 @@ static const struct sd_desc sd_desc = { .pkt_scan = sd_pkt_scan, .get_jcomp = sd_get_jcomp, .set_jcomp = sd_set_jcomp, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };