---

yaml --- r: 357407 b: refs/heads/master c: 78f968f h: refs/heads/master i: 357405: fc60bc0 357403: 7470b9b 357399: 7cc680e 357391: 59356f5 357375: 4065b16 v: v3
git-mirror · Feb 5, 2013 · cc9db11 · cc9db11
1 parent c44f358
commit cc9db11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
 };