From fc60bc0991fb3de4787d8e34f6e8ca43b79f0a94 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Thu, 24 Jan 2013 19:29:11 -0300
Subject: [PATCH] --- yaml --- r: 357405 b: refs/heads/master c:
 f8d2687963d789b78d86cfecff54604f447aa3a2 h: refs/heads/master i:   357403:
 7470b9b4ef58be7518bcddfe7cc726718765b453 v: v3

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

diff --git a/[refs] b/[refs]
index 95aa30e83b32..09e5f6d8b852 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00ddb70702275aabcc7f9f999adaf8bc81756b54
+refs/heads/master: f8d2687963d789b78d86cfecff54604f447aa3a2
diff --git a/trunk/drivers/media/usb/gspca/t613.c b/trunk/drivers/media/usb/gspca/t613.c
index b92d4ef2de6e..e2cc4e5a0ccb 100644
--- a/trunk/drivers/media/usb/gspca/t613.c
+++ b/trunk/drivers/media/usb/gspca/t613.c
@@ -823,7 +823,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 		msleep(20);
 		reg_w(gspca_dev, 0x0309);
 	}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 	/* If the last button state is pressed, release it now! */
 	if (sd->button_pressed) {
 		input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -841,7 +841,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 	int pkt_type;
 
 	if (data[0] == 0x5a) {
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 		if (len > 20) {
 			u8 state = (data[20] & 0x80) ? 1 : 0;
 			if (sd->button_pressed != state) {
@@ -1019,7 +1019,7 @@ static const struct sd_desc sd_desc = {
 	.start = sd_start,
 	.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
 };