From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-qa0-f48.google.com ([209.85.216.48]:39874 "EHLO mail-qa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3ASQen (ORCPT ); Sat, 19 Jan 2013 11:34:43 -0500 From: Peter Senna Tschudin To: hdegoede@redhat.com Cc: mchehab@redhat.com, hans.verkuil@cisco.com, peter.senna@gmail.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 18/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:20 -0200 Message-Id: <1358613206-4274-17-git-send-email-peter.senna@gmail.com> 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 List-ID: 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/stv06xx/stv06xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c index 999ec77..657160b 100644 --- a/drivers/media/usb/gspca/stv06xx/stv06xx.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c @@ -492,7 +492,7 @@ frame_data: } } -#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 */ @@ -529,7 +529,7 @@ static const struct sd_desc sd_desc = { .pkt_scan = stv06xx_pkt_scan, .isoc_init = stv06xx_isoc_init, .isoc_nego = stv06xx_isoc_nego, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif }; -- 1.7.11.7