aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:13 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:43 -0500
commit78f968fa26acbdf44457a7bc35a195b7df040b29 (patch)
treefa991875257f43c4cd2cd5949c96d9399fcc1054 /drivers/media/usb/gspca
parente32d6eb865bbb693b1612a0fbf2ceeb6b51e208c (diff)
[media] usb/gspca/zc3xx.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>
Diffstat (limited to 'drivers/media/usb/gspca')
-rw-r--r--drivers/media/usb/gspca/zc3xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index 77c57755e7b4..a8dc421f9f1f 100644
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -6902,7 +6902,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
6902 return 0; 6902 return 0;
6903} 6903}
6904 6904
6905#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 6905#if IS_ENABLED(CONFIG_INPUT)
6906static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 6906static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
6907 u8 *data, /* interrupt packet data */ 6907 u8 *data, /* interrupt packet data */
6908 int len) /* interrput packet length */ 6908 int len) /* interrput packet length */
@@ -6929,7 +6929,7 @@ static const struct sd_desc sd_desc = {
6929 .pkt_scan = sd_pkt_scan, 6929 .pkt_scan = sd_pkt_scan,
6930 .get_jcomp = sd_get_jcomp, 6930 .get_jcomp = sd_get_jcomp,
6931 .set_jcomp = sd_set_jcomp, 6931 .set_jcomp = sd_set_jcomp,
6932#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 6932#if IS_ENABLED(CONFIG_INPUT)
6933 .int_pkt_scan = sd_int_pkt_scan, 6933 .int_pkt_scan = sd_int_pkt_scan,
6934#endif 6934#endif
6935}; 6935};