---

yaml --- r: 357399 b: refs/heads/master c: 5fd3083 h: refs/heads/master i: 357397: 77170ff 357395: a9328f7 357391: 59356f5 v: v3
git-mirror · Feb 5, 2013 · 7cc680e · 7cc680e
1 parent fb60b90
commit 7cc680e
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: 2d622e9137d504ea4eb636efca5cd04c494a1ede
+refs/heads/master: 5fd30838da11dc8ce1c5c9d4d1091ea764ee29b3
diff --git a/trunk/drivers/media/usb/gspca/se401.c b/trunk/drivers/media/usb/gspca/se401.c
@@ -594,7 +594,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len)
 		sd_pkt_scan_janggu(gspca_dev, data, len);
 }
 
-#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, int len)
 {
 	struct sd *sd = (struct sd *)gspca_dev;
@@ -688,7 +688,7 @@ static const struct sd_desc sd_desc = {
 	.stopN = sd_stopN,
 	.dq_callback = sd_dq_callback,
 	.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
 };