From a9328f750fe9aaa99e178322694822a80ab22ca5 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Thu, 24 Jan 2013 19:29:01 -0300 Subject: [PATCH] --- yaml --- r: 357395 b: refs/heads/master c: c4ea799a2bbbc5623f405233382c36b1f3aa9684 h: refs/heads/master i: 357393: 096deafa55047c5f8cd2fd696e9e385a6cf7b8b3 357391: 59356f5eca14e15905d82843712e9e5597b91ff0 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/gspca/ov519.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dc586d1b0fc7..68376faa5ab3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bc044633161e23f3f2c590bc572df8eb722f94b +refs/heads/master: c4ea799a2bbbc5623f405233382c36b1f3aa9684 diff --git a/trunk/drivers/media/usb/gspca/ov519.c b/trunk/drivers/media/usb/gspca/ov519.c index 9aa09f845ce4..9ad19a7ef81b 100644 --- a/trunk/drivers/media/usb/gspca/ov519.c +++ b/trunk/drivers/media/usb/gspca/ov519.c @@ -4238,7 +4238,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) if (sd->bridge == BRIDGE_W9968CF) w9968cf_stop0(sd); -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) /* If the last button state is pressed, release it now! */ if (sd->snapshot_pressed) { input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); @@ -4255,7 +4255,7 @@ static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state) struct sd *sd = (struct sd *) gspca_dev; if (sd->snapshot_pressed != state) { -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) input_report_key(gspca_dev->input_dev, KEY_CAMERA, state); input_sync(gspca_dev->input_dev); #endif @@ -4924,7 +4924,7 @@ static const struct sd_desc sd_desc = { .dq_callback = sd_reset_snapshot, .get_jcomp = sd_get_jcomp, .set_jcomp = sd_set_jcomp, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .other_input = 1, #endif };