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

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

diff --git a/[refs] b/[refs]
index fbb4bed99b03..82a233e5d9eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae814c0845624a836918a09745c8b9e6ab3096b2
+refs/heads/master: 2d622e9137d504ea4eb636efca5cd04c494a1ede
diff --git a/trunk/drivers/media/usb/gspca/pac7311.c b/trunk/drivers/media/usb/gspca/pac7311.c
index ba3558d3f017..a12dfbf6e051 100644
--- a/trunk/drivers/media/usb/gspca/pac7311.c
+++ b/trunk/drivers/media/usb/gspca/pac7311.c
@@ -621,7 +621,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 	gspca_frame_add(gspca_dev, INTER_PACKET, 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,		/* interrupt packet data */
 			int len)		/* interrupt packet length */
@@ -661,7 +661,7 @@ static const struct sd_desc sd_desc = {
 	.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)
 	.int_pkt_scan = sd_int_pkt_scan,
 #endif
 };