aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:10 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:34 -0500
commit00ddb70702275aabcc7f9f999adaf8bc81756b54 (patch)
tree418624732a8ba97bb300666a327f7899519b82ea
parent60d21563785535e518589ab58b0295ecaa06233f (diff)
[media] usb/gspca/stv06xx/stv06xx.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/stv06xx/stv06xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c
index 999ec7764449..657160b4a1f7 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c
@@ -492,7 +492,7 @@ frame_data:
492 } 492 }
493} 493}
494 494
495#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 495#if IS_ENABLED(CONFIG_INPUT)
496static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 496static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
497 u8 *data, /* interrupt packet data */ 497 u8 *data, /* interrupt packet data */
498 int len) /* interrupt packet length */ 498 int len) /* interrupt packet length */
@@ -529,7 +529,7 @@ static const struct sd_desc sd_desc = {
529 .pkt_scan = stv06xx_pkt_scan, 529 .pkt_scan = stv06xx_pkt_scan,
530 .isoc_init = stv06xx_isoc_init, 530 .isoc_init = stv06xx_isoc_init,
531 .isoc_nego = stv06xx_isoc_nego, 531 .isoc_nego = stv06xx_isoc_nego,
532#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 532#if IS_ENABLED(CONFIG_INPUT)
533 .int_pkt_scan = sd_int_pkt_scan, 533 .int_pkt_scan = sd_int_pkt_scan,
534#endif 534#endif
535}; 535};