diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 17:29:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 11:54:31 -0500 |
commit | 60d21563785535e518589ab58b0295ecaa06233f (patch) | |
tree | 2fa9a8d915dc7ce61125059adf240b4cbdf31d69 /drivers | |
parent | f11ef42e3116eaed653c6e7bbd33ec769a7ae0ba (diff) |
[media] usb/gspca/spca561.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')
-rw-r--r-- | drivers/media/usb/gspca/spca561.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/spca561.c b/drivers/media/usb/gspca/spca561.c index cfe71dd6747d..d1db3d8f6522 100644 --- a/drivers/media/usb/gspca/spca561.c +++ b/drivers/media/usb/gspca/spca561.c | |||
@@ -741,7 +741,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
741 | return; | 741 | return; |
742 | } | 742 | } |
743 | 743 | ||
744 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 744 | #if IS_ENABLED(CONFIG_INPUT) |
745 | if (data[0] & 0x20) { | 745 | if (data[0] & 0x20) { |
746 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); | 746 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); |
747 | input_sync(gspca_dev->input_dev); | 747 | input_sync(gspca_dev->input_dev); |
@@ -866,7 +866,7 @@ static const struct sd_desc sd_desc_12a = { | |||
866 | .start = sd_start_12a, | 866 | .start = sd_start_12a, |
867 | .stopN = sd_stopN, | 867 | .stopN = sd_stopN, |
868 | .pkt_scan = sd_pkt_scan, | 868 | .pkt_scan = sd_pkt_scan, |
869 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 869 | #if IS_ENABLED(CONFIG_INPUT) |
870 | .other_input = 1, | 870 | .other_input = 1, |
871 | #endif | 871 | #endif |
872 | }; | 872 | }; |
@@ -879,7 +879,7 @@ static const struct sd_desc sd_desc_72a = { | |||
879 | .stopN = sd_stopN, | 879 | .stopN = sd_stopN, |
880 | .pkt_scan = sd_pkt_scan, | 880 | .pkt_scan = sd_pkt_scan, |
881 | .dq_callback = do_autogain, | 881 | .dq_callback = do_autogain, |
882 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 882 | #if IS_ENABLED(CONFIG_INPUT) |
883 | .other_input = 1, | 883 | .other_input = 1, |
884 | #endif | 884 | #endif |
885 | }; | 885 | }; |