diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 19:29:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 14:54:34 -0200 |
| commit | 00ddb70702275aabcc7f9f999adaf8bc81756b54 (patch) | |
| tree | 418624732a8ba97bb300666a327f7899519b82ea /drivers/media/usb | |
| parent | 60d21563785535e518589ab58b0295ecaa06233f (diff) | |
| download | linux-3.10-00ddb70702275aabcc7f9f999adaf8bc81756b54.tar.gz linux-3.10-00ddb70702275aabcc7f9f999adaf8bc81756b54.tar.bz2 linux-3.10-00ddb70702275aabcc7f9f999adaf8bc81756b54.zip | |
[media] usb/gspca/stv06xx/stv06xx.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/stv06xx/stv06xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c index 999ec776444..657160b4a1f 100644 --- a/drivers/media/usb/gspca/stv06xx/stv06xx.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c @@ -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 }; |