aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:06 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:22 -0500
commit8099affaa6da1cc41fca03320b5621f95c6114ea (patch)
tree1aa050552e16dc50a4908a4f79f795f711aebe77
parent5fd30838da11dc8ce1c5c9d4d1091ea764ee29b3 (diff)
[media] usb/gspca/sn9c20x.c: use IS_ENABLED() macro
replace: #if defined(CONFIG_INPUT) || \ defined(CONFIG_INPUT_MODULE) with: #if IS_ENABLED(CONFIG_INPUT) This change was made for: CONFIG_INPUT Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/gspca/sn9c20x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c
index 41f769fe340c..4ec544f4a845 100644
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -2205,7 +2205,7 @@ static void qual_upd(struct work_struct *work)
2205 mutex_unlock(&gspca_dev->usb_lock); 2205 mutex_unlock(&gspca_dev->usb_lock);
2206} 2206}
2207 2207
2208#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 2208#if IS_ENABLED(CONFIG_INPUT)
2209static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 2209static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
2210 u8 *data, /* interrupt packet */ 2210 u8 *data, /* interrupt packet */
2211 int len) /* interrupt packet length */ 2211 int len) /* interrupt packet length */
@@ -2349,7 +2349,7 @@ static const struct sd_desc sd_desc = {
2349 .stopN = sd_stopN, 2349 .stopN = sd_stopN,
2350 .stop0 = sd_stop0, 2350 .stop0 = sd_stop0,
2351 .pkt_scan = sd_pkt_scan, 2351 .pkt_scan = sd_pkt_scan,
2352#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 2352#if IS_ENABLED(CONFIG_INPUT)
2353 .int_pkt_scan = sd_int_pkt_scan, 2353 .int_pkt_scan = sd_int_pkt_scan,
2354#endif 2354#endif
2355 .dq_callback = sd_dqcallback, 2355 .dq_callback = sd_dqcallback,