diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-10-01 06:33:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:20 -0400 |
commit | 2856643e2e18f306227ae1257b63fc713d426dc7 (patch) | |
tree | 95d66ed5853da693ec44729f592ee3e2f3dea80a /drivers/media/video/gspca/zc3xx.c | |
parent | 85c55efb0a20c5dac435a6817ffb20fe988b9122 (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/zc3xx.c')
-rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index e2f1a0e1e2c..c9c2b89c5bf 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -21,9 +21,7 @@ | |||
21 | 21 | ||
22 | #define MODULE_NAME "zc3xx" | 22 | #define MODULE_NAME "zc3xx" |
23 | 23 | ||
24 | #ifdef CONFIG_INPUT | ||
25 | #include <linux/input.h> | 24 | #include <linux/input.h> |
26 | #endif | ||
27 | #include "gspca.h" | 25 | #include "gspca.h" |
28 | #include "jpeg.h" | 26 | #include "jpeg.h" |
29 | 27 | ||
@@ -7006,7 +7004,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev, | |||
7006 | return 0; | 7004 | return 0; |
7007 | } | 7005 | } |
7008 | 7006 | ||
7009 | #ifdef CONFIG_INPUT | 7007 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) |
7010 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, | 7008 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, |
7011 | u8 *data, /* interrupt packet data */ | 7009 | u8 *data, /* interrupt packet data */ |
7012 | int len) /* interrput packet length */ | 7010 | int len) /* interrput packet length */ |
@@ -7034,7 +7032,7 @@ static const struct sd_desc sd_desc = { | |||
7034 | .querymenu = sd_querymenu, | 7032 | .querymenu = sd_querymenu, |
7035 | .get_jcomp = sd_get_jcomp, | 7033 | .get_jcomp = sd_get_jcomp, |
7036 | .set_jcomp = sd_set_jcomp, | 7034 | .set_jcomp = sd_set_jcomp, |
7037 | #ifdef CONFIG_INPUT | 7035 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) |
7038 | .int_pkt_scan = sd_int_pkt_scan, | 7036 | .int_pkt_scan = sd_int_pkt_scan, |
7039 | #endif | 7037 | #endif |
7040 | }; | 7038 | }; |