aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:04 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:07 -0500
commit2d622e9137d504ea4eb636efca5cd04c494a1ede (patch)
treea95d7118011e5f92021231ef742868f5a15cd6cf
parentae814c0845624a836918a09745c8b9e6ab3096b2 (diff)
[media] usb/gspca/pac7311.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/pac7311.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c
index ba3558d3f017..a12dfbf6e051 100644
--- a/drivers/media/usb/gspca/pac7311.c
+++ b/drivers/media/usb/gspca/pac7311.c
@@ -621,7 +621,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
621 gspca_frame_add(gspca_dev, INTER_PACKET, data, len); 621 gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
622} 622}
623 623
624#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 624#if IS_ENABLED(CONFIG_INPUT)
625static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 625static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
626 u8 *data, /* interrupt packet data */ 626 u8 *data, /* interrupt packet data */
627 int len) /* interrupt packet length */ 627 int len) /* interrupt packet length */
@@ -661,7 +661,7 @@ static const struct sd_desc sd_desc = {
661 .stopN = sd_stopN, 661 .stopN = sd_stopN,
662 .pkt_scan = sd_pkt_scan, 662 .pkt_scan = sd_pkt_scan,
663 .dq_callback = do_autogain, 663 .dq_callback = do_autogain,
664#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 664#if IS_ENABLED(CONFIG_INPUT)
665 .int_pkt_scan = sd_int_pkt_scan, 665 .int_pkt_scan = sd_int_pkt_scan,
666#endif 666#endif
667}; 667};