aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:02 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:53:58 -0500
commit4f4d1785352f92aa1eeff39d030a50cabeb0c8f3 (patch)
tree748824d17686484c17fa4d0e5ab2183723e81b39
parentc4ea799a2bbbc5623f405233382c36b1f3aa9684 (diff)
[media] usb/gspca/pac207.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/pac207.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c
index 1f253dfebe47..3b75097dd34e 100644
--- a/drivers/media/usb/gspca/pac207.c
+++ b/drivers/media/usb/gspca/pac207.c
@@ -413,7 +413,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
413 gspca_frame_add(gspca_dev, INTER_PACKET, data, len); 413 gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
414} 414}
415 415
416#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 416#if IS_ENABLED(CONFIG_INPUT)
417static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 417static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
418 u8 *data, /* interrupt packet data */ 418 u8 *data, /* interrupt packet data */
419 int len) /* interrput packet length */ 419 int len) /* interrput packet length */
@@ -442,7 +442,7 @@ static const struct sd_desc sd_desc = {
442 .stopN = sd_stopN, 442 .stopN = sd_stopN,
443 .dq_callback = pac207_do_auto_gain, 443 .dq_callback = pac207_do_auto_gain,
444 .pkt_scan = sd_pkt_scan, 444 .pkt_scan = sd_pkt_scan,
445#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 445#if IS_ENABLED(CONFIG_INPUT)
446 .int_pkt_scan = sd_int_pkt_scan, 446 .int_pkt_scan = sd_int_pkt_scan,
447#endif 447#endif
448}; 448};