From 4aa72951990e0ecd4620368ae13dec4043b193b7 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Thu, 24 Jan 2013 19:29:06 -0300 Subject: [PATCH] --- yaml --- r: 357400 b: refs/heads/master c: 8099affaa6da1cc41fca03320b5621f95c6114ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/gspca/sn9c20x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a8d7e86ce3c..9685b6535bac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fd30838da11dc8ce1c5c9d4d1091ea764ee29b3 +refs/heads/master: 8099affaa6da1cc41fca03320b5621f95c6114ea diff --git a/trunk/drivers/media/usb/gspca/sn9c20x.c b/trunk/drivers/media/usb/gspca/sn9c20x.c index 41f769fe340c..4ec544f4a845 100644 --- a/trunk/drivers/media/usb/gspca/sn9c20x.c +++ b/trunk/drivers/media/usb/gspca/sn9c20x.c @@ -2205,7 +2205,7 @@ static void qual_upd(struct work_struct *work) mutex_unlock(&gspca_dev->usb_lock); } -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, /* interrupt packet */ int len) /* interrupt packet length */ @@ -2349,7 +2349,7 @@ static const struct sd_desc sd_desc = { .stopN = sd_stopN, .stop0 = sd_stop0, .pkt_scan = sd_pkt_scan, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif .dq_callback = sd_dqcallback,