From cc9db118dd65f19c1db1336b061ac9084708e19f Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Thu, 24 Jan 2013 19:29:13 -0300
Subject: [PATCH] --- yaml --- r: 357407 b: refs/heads/master c:
 78f968fa26acbdf44457a7bc35a195b7df040b29 h: refs/heads/master i:   357405:
 fc60bc0991fb3de4787d8e34f6e8ca43b79f0a94   357403:
 7470b9b4ef58be7518bcddfe7cc726718765b453   357399:
 7cc680e735f544d7fffedf52375643f49139bf38   357391:
 59356f5eca14e15905d82843712e9e5597b91ff0   357375:
 4065b16c421f96fed0030935d69347ecc575fb21 v: v3

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

diff --git a/[refs] b/[refs]
index 0b06fbaed15f..29acfeed929f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e32d6eb865bbb693b1612a0fbf2ceeb6b51e208c
+refs/heads/master: 78f968fa26acbdf44457a7bc35a195b7df040b29
diff --git a/trunk/drivers/media/usb/gspca/zc3xx.c b/trunk/drivers/media/usb/gspca/zc3xx.c
index 77c57755e7b4..a8dc421f9f1f 100644
--- a/trunk/drivers/media/usb/gspca/zc3xx.c
+++ b/trunk/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
 };