diff --git a/[refs] b/[refs] index 82a233e5d9eb..4a8d7e86ce3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d622e9137d504ea4eb636efca5cd04c494a1ede +refs/heads/master: 5fd30838da11dc8ce1c5c9d4d1091ea764ee29b3 diff --git a/trunk/drivers/media/usb/gspca/se401.c b/trunk/drivers/media/usb/gspca/se401.c index a33cb78a839c..5f729b8aa2bd 100644 --- a/trunk/drivers/media/usb/gspca/se401.c +++ b/trunk/drivers/media/usb/gspca/se401.c @@ -594,7 +594,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len) sd_pkt_scan_janggu(gspca_dev, data, len); } -#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, int len) { struct sd *sd = (struct sd *)gspca_dev; @@ -688,7 +688,7 @@ static const struct sd_desc sd_desc = { .stopN = sd_stopN, .dq_callback = sd_dq_callback, .pkt_scan = sd_pkt_scan, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };