From 83caf0508e268637d109f7b73ab8e5d8a3da7d35 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Thu, 24 Jan 2013 19:29:10 -0300
Subject: [PATCH] --- yaml --- r: 357404 b: refs/heads/master c:
 00ddb70702275aabcc7f9f999adaf8bc81756b54 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 68debb04227c..95aa30e83b32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60d21563785535e518589ab58b0295ecaa06233f
+refs/heads/master: 00ddb70702275aabcc7f9f999adaf8bc81756b54
diff --git a/trunk/drivers/media/usb/gspca/stv06xx/stv06xx.c b/trunk/drivers/media/usb/gspca/stv06xx/stv06xx.c
index 999ec7764449..657160b4a1f7 100644
--- a/trunk/drivers/media/usb/gspca/stv06xx/stv06xx.c
+++ b/trunk/drivers/media/usb/gspca/stv06xx/stv06xx.c
@@ -492,7 +492,7 @@ static void stv06xx_pkt_scan(struct gspca_dev *gspca_dev,
 	}
 }
 
-#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)		/* interrupt packet length */
@@ -529,7 +529,7 @@ static const struct sd_desc sd_desc = {
 	.pkt_scan = stv06xx_pkt_scan,
 	.isoc_init = stv06xx_isoc_init,
 	.isoc_nego = stv06xx_isoc_nego,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 	.int_pkt_scan = sd_int_pkt_scan,
 #endif
 };