From 7470b9b4ef58be7518bcddfe7cc726718765b453 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Thu, 24 Jan 2013 19:29:09 -0300
Subject: [PATCH] --- yaml --- r: 357403 b: refs/heads/master c:
 60d21563785535e518589ab58b0295ecaa06233f h: refs/heads/master i:   357401:
 89a1257825658accc08fde3f22ce0b789ba6559e   357399:
 7cc680e735f544d7fffedf52375643f49139bf38 v: v3

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

diff --git a/[refs] b/[refs]
index db1ae0d7f5c8..68debb04227c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba
+refs/heads/master: 60d21563785535e518589ab58b0295ecaa06233f
diff --git a/trunk/drivers/media/usb/gspca/spca561.c b/trunk/drivers/media/usb/gspca/spca561.c
index cfe71dd6747d..d1db3d8f6522 100644
--- a/trunk/drivers/media/usb/gspca/spca561.c
+++ b/trunk/drivers/media/usb/gspca/spca561.c
@@ -741,7 +741,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 			return;
 		}
 
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 		if (data[0] & 0x20) {
 			input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1);
 			input_sync(gspca_dev->input_dev);
@@ -866,7 +866,7 @@ static const struct sd_desc sd_desc_12a = {
 	.start = sd_start_12a,
 	.stopN = sd_stopN,
 	.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 	.other_input = 1,
 #endif
 };
@@ -879,7 +879,7 @@ static const struct sd_desc sd_desc_72a = {
 	.stopN = sd_stopN,
 	.pkt_scan = sd_pkt_scan,
 	.dq_callback = do_autogain,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 	.other_input = 1,
 #endif
 };