aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sn9c20x.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-10-01 06:33:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:20 -0400
commit2856643e2e18f306227ae1257b63fc713d426dc7 (patch)
tree95d66ed5853da693ec44729f592ee3e2f3dea80a /drivers/media/video/gspca/sn9c20x.c
parent85c55efb0a20c5dac435a6817ffb20fe988b9122 (diff)
V4L/DVB: gspca - many subdrivers: Handle the buttons when CONFIG_INPUT=m
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sn9c20x.c')
-rw-r--r--drivers/media/video/gspca/sn9c20x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 53ed0f7e0219..57673891c2c2 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -18,9 +18,7 @@
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 20
21#ifdef CONFIG_INPUT
22#include <linux/input.h> 21#include <linux/input.h>
23#endif
24 22
25#include "gspca.h" 23#include "gspca.h"
26#include "jpeg.h" 24#include "jpeg.h"
@@ -2304,7 +2302,7 @@ static void sd_dqcallback(struct gspca_dev *gspca_dev)
2304 do_autoexposure(gspca_dev, avg_lum); 2302 do_autoexposure(gspca_dev, avg_lum);
2305} 2303}
2306 2304
2307#ifdef CONFIG_INPUT 2305#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
2308static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 2306static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
2309 u8 *data, /* interrupt packet */ 2307 u8 *data, /* interrupt packet */
2310 int len) /* interrupt packet length */ 2308 int len) /* interrupt packet length */
@@ -2386,7 +2384,7 @@ static const struct sd_desc sd_desc = {
2386 .start = sd_start, 2384 .start = sd_start,
2387 .stopN = sd_stopN, 2385 .stopN = sd_stopN,
2388 .pkt_scan = sd_pkt_scan, 2386 .pkt_scan = sd_pkt_scan,
2389#ifdef CONFIG_INPUT 2387#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
2390 .int_pkt_scan = sd_int_pkt_scan, 2388 .int_pkt_scan = sd_int_pkt_scan,
2391#endif 2389#endif
2392 .dq_callback = sd_dqcallback, 2390 .dq_callback = sd_dqcallback,