diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-19 17:41:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 06:19:16 -0500 |
commit | 8c31522c64968ae790b0d767d27655c24d913837 (patch) | |
tree | dde21cc08a2b3e8ad9a334e009cd2af90067e0ab | |
parent | 8268979a429f6c3f6584d7d650af84444336d468 (diff) |
[media] [V2,02/24] pci/saa7134/saa7134.h: use IS_ENABLED() macro
replace:
#if defined(CONFIG_VIDEO_SAA7134_DVB) || \
defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
with:
#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
This change was made for: CONFIG_VIDEO_SAA7134_DVB
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 6eae4321229a..f804324e07fd 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <media/videobuf-dma-sg.h> | 42 | #include <media/videobuf-dma-sg.h> |
43 | #include <sound/core.h> | 43 | #include <sound/core.h> |
44 | #include <sound/pcm.h> | 44 | #include <sound/pcm.h> |
45 | #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) | 45 | #if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) |
46 | #include <media/videobuf-dvb.h> | 46 | #include <media/videobuf-dvb.h> |
47 | #endif | 47 | #endif |
48 | 48 | ||
@@ -644,7 +644,7 @@ struct saa7134_dev { | |||
644 | struct work_struct empress_workqueue; | 644 | struct work_struct empress_workqueue; |
645 | int empress_started; | 645 | int empress_started; |
646 | 646 | ||
647 | #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) | 647 | #if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) |
648 | /* SAA7134_MPEG_DVB only */ | 648 | /* SAA7134_MPEG_DVB only */ |
649 | struct videobuf_dvb_frontends frontends; | 649 | struct videobuf_dvb_frontends frontends; |
650 | int (*original_demod_sleep)(struct dvb_frontend *fe); | 650 | int (*original_demod_sleep)(struct dvb_frontend *fe); |