aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca/pac7302.c
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:03 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:04 -0500
commitae814c0845624a836918a09745c8b9e6ab3096b2 (patch)
treec61f4f1a16af3b34c8d0e884e3917235d9afce85 /drivers/media/usb/gspca/pac7302.c
parent4f4d1785352f92aa1eeff39d030a50cabeb0c8f3 (diff)
[media] gspca/pac7302.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/pac7302.c')
-rw-r--r--drivers/media/usb/gspca/pac7302.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c
index 4f5869a98082..add6f725ba50 100644
--- a/drivers/media/usb/gspca/pac7302.c
+++ b/drivers/media/usb/gspca/pac7302.c
@@ -890,7 +890,7 @@ static int sd_chip_ident(struct gspca_dev *gspca_dev,
890} 890}
891#endif 891#endif
892 892
893#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 893#if IS_ENABLED(CONFIG_INPUT)
894static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, 894static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
895 u8 *data, /* interrupt packet data */ 895 u8 *data, /* interrupt packet data */
896 int len) /* interrput packet length */ 896 int len) /* interrput packet length */
@@ -936,7 +936,7 @@ static const struct sd_desc sd_desc = {
936 .set_register = sd_dbg_s_register, 936 .set_register = sd_dbg_s_register,
937 .get_chip_ident = sd_chip_ident, 937 .get_chip_ident = sd_chip_ident,
938#endif 938#endif
939#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 939#if IS_ENABLED(CONFIG_INPUT)
940 .int_pkt_scan = sd_int_pkt_scan, 940 .int_pkt_scan = sd_int_pkt_scan,
941#endif 941#endif
942}; 942};