From b300aee9ce82b5045d5349ecd6620bd8135b02f5 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Thu, 24 Jan 2013 19:29:08 -0300
Subject: [PATCH] --- yaml --- r: 357402 b: refs/heads/master c:
 f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/usb/gspca/sonixj.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8a33cab986b8..db1ae0d7f5c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5b6de9cf6f862e2c74854a8f6969879a1440283
+refs/heads/master: f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba
diff --git a/trunk/drivers/media/usb/gspca/sonixj.c b/trunk/drivers/media/usb/gspca/sonixj.c
index 36307a9028a9..671d0c6dece3 100644
--- a/trunk/drivers/media/usb/gspca/sonixj.c
+++ b/trunk/drivers/media/usb/gspca/sonixj.c
@@ -3077,7 +3077,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
 	return -EINVAL;
 }
 
-#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 */
@@ -3109,7 +3109,7 @@ static const struct sd_desc sd_desc = {
 	.pkt_scan = sd_pkt_scan,
 	.dq_callback = do_autogain,
 	.querymenu = sd_querymenu,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 	.int_pkt_scan = sd_int_pkt_scan,
 #endif
 };