diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 19:29:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 14:54:37 -0200 |
| commit | f8d2687963d789b78d86cfecff54604f447aa3a2 (patch) | |
| tree | b46b3ff32c5afdebf8d3a79555d3469e37ff4858 /drivers/media/usb/gspca | |
| parent | 00ddb70702275aabcc7f9f999adaf8bc81756b54 (diff) | |
| download | talos-obmc-linux-f8d2687963d789b78d86cfecff54604f447aa3a2.tar.gz talos-obmc-linux-f8d2687963d789b78d86cfecff54604f447aa3a2.zip | |
[media] usb/gspca/t613.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/gspca')
| -rw-r--r-- | drivers/media/usb/gspca/t613.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c index b92d4ef2de6e..e2cc4e5a0ccb 100644 --- a/drivers/media/usb/gspca/t613.c +++ b/drivers/media/usb/gspca/t613.c @@ -823,7 +823,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) msleep(20); reg_w(gspca_dev, 0x0309); } -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) /* If the last button state is pressed, release it now! */ if (sd->button_pressed) { input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); @@ -841,7 +841,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, int pkt_type; if (data[0] == 0x5a) { -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) if (len > 20) { u8 state = (data[20] & 0x80) ? 1 : 0; if (sd->button_pressed != state) { @@ -1019,7 +1019,7 @@ static const struct sd_desc sd_desc = { .start = sd_start, .stopN = sd_stopN, .pkt_scan = sd_pkt_scan, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .other_input = 1, #endif }; |
