[media] usb/gspca/stv06xx/stv06xx.c: use IS_ENABLED() macro
authorPeter Senna Tschudin <peter.senna@gmail.com>
Thu, 24 Jan 2013 22:29:10 +0000 (19:29 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 5 Feb 2013 16:54:34 +0000 (14:54 -0200)
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>
drivers/media/usb/gspca/stv06xx/stv06xx.c

index 999ec77..657160b 100644 (file)
@@ -492,7 +492,7 @@ frame_data:
        }
 }
 
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
 static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
                        u8 *data,               /* interrupt packet data */
                        int len)                /* interrupt packet length */
@@ -529,7 +529,7 @@ static const struct sd_desc sd_desc = {
        .pkt_scan = stv06xx_pkt_scan,
        .isoc_init = stv06xx_isoc_init,
        .isoc_nego = stv06xx_isoc_nego,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
        .int_pkt_scan = sd_int_pkt_scan,
 #endif
 };