From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-qa0-f45.google.com ([209.85.216.45]:62339 "EHLO mail-qa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3ASQef (ORCPT ); Sat, 19 Jan 2013 11:34:35 -0500 From: Peter Senna Tschudin To: brijohn@gmail.com Cc: hdegoede@redhat.com, mchehab@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 14/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:17 -0200 Message-Id: <1358613206-4274-14-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/sn9c20x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c index 41f769f..4ec544f 100644 --- a/drivers/media/usb/gspca/sn9c20x.c +++ b/drivers/media/usb/gspca/sn9c20x.c @@ -2205,7 +2205,7 @@ static void qual_upd(struct work_struct *work) mutex_unlock(&gspca_dev->usb_lock); } -#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 */ int len) /* interrupt packet length */ @@ -2349,7 +2349,7 @@ static const struct sd_desc sd_desc = { .stopN = sd_stopN, .stop0 = sd_stop0, .pkt_scan = sd_pkt_scan, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif .dq_callback = sd_dqcallback, -- 1.7.11.7