V4L/DVB: gspca - many subdrivers: Handle the buttons when CONFIG_INPUT=m

[pandora-kernel.git] / drivers / media / video / gspca / konica.c

diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index 31ea306..f3fe33c 100644 (file)
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -352,7 +352,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
        struct sd *sd = (struct sd *) gspca_dev;
 
        konica_stream_off(gspca_dev);
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
        /* Don't keep the button in the pressed state "forever" if it was
           pressed when streaming is stopped */
        if (sd->snapshot_pressed) {
@@ -451,7 +451,7 @@ static void sd_isoc_irq(struct urb *urb)
                        gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
                        gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0);
                } else {
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
                        u8 button_state = st & 0x40 ? 1 : 0;
                        if (sd->snapshot_pressed != button_state) {
                                input_report_key(gspca_dev->input_dev,
@@ -601,7 +601,7 @@ static const struct sd_desc sd_desc = {
        .init = sd_init,
        .start = sd_start,
        .stopN = sd_stopN,
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
        .other_input = 1,
 #endif
 };