|
@@ -1400,7 +1400,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
-#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 */
|
|
@@ -1430,7 +1430,7 @@ static const struct sd_desc sd_desc = {
|
|
|
.pkt_scan = sd_pkt_scan,
|
|
|
.querymenu = sd_querymenu,
|
|
|
.dq_callback = do_autogain,
|
|
|
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_INPUT)
|
|
|
.int_pkt_scan = sd_int_pkt_scan,
|
|
|
#endif
|
|
|
};
|
|
@@ -1448,7 +1448,7 @@ static const struct usb_device_id device_table[] = {
|
|
|
{USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},
|
|
|
{USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},
|
|
|
{USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},
|
|
|
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
|
|
+#if !IS_ENABLED(CONFIG_USB_SN9C102)
|
|
|
{USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},
|
|
|
{USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},
|
|
|
#endif
|