summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/stv06xx/stv06xx.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-10-01 07:33:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:06:20 -0200
commit2856643e2e18f306227ae1257b63fc713d426dc7 (patch)
tree95d66ed5853da693ec44729f592ee3e2f3dea80a /drivers/media/video/gspca/stv06xx/stv06xx.c
parent85c55efb0a20c5dac435a6817ffb20fe988b9122 (diff)
downloadop-kernel-dev-2856643e2e18f306227ae1257b63fc713d426dc7.zip
op-kernel-dev-2856643e2e18f306227ae1257b63fc713d426dc7.tar.gz
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/stv06xx/stv06xx.c')
-rw-r--r--drivers/media/video/gspca/stv06xx/stv06xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index b818ab8..086de44 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -428,7 +428,7 @@ frame_data:
}
}
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrupt packet length */
@@ -462,7 +462,7 @@ static const struct sd_desc sd_desc = {
.start = stv06xx_start,
.stopN = stv06xx_stopN,
.pkt_scan = stv06xx_pkt_scan,
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
OpenPOWER on IntegriCloud