diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 19:29:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 14:54:27 -0200 |
| commit | f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba (patch) | |
| tree | a7c2d353f6a0928c77c5ce7de6c14127545c0ec5 /drivers/media/usb | |
| parent | f5b6de9cf6f862e2c74854a8f6969879a1440283 (diff) | |
| download | linux-3.10-f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba.tar.gz linux-3.10-f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba.tar.bz2 linux-3.10-f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba.zip | |
[media] usb/gspca/sonixj.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')
| -rw-r--r-- | drivers/media/usb/gspca/sonixj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c index 36307a9028a..671d0c6dece 100644 --- a/drivers/media/usb/gspca/sonixj.c +++ b/drivers/media/usb/gspca/sonixj.c @@ -3077,7 +3077,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 */ @@ -3109,7 +3109,7 @@ static const struct sd_desc sd_desc = { .pkt_scan = sd_pkt_scan, .dq_callback = do_autogain, .querymenu = sd_querymenu, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif }; |