diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-19 23:41:09 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 12:19:16 +0100 |
| commit | 8c31522c64968ae790b0d767d27655c24d913837 (patch) | |
| tree | dde21cc08a2b3e8ad9a334e009cd2af90067e0ab /drivers/media/pci/saa7134 | |
| parent | [media] [V2,01/24] pci/cx88/cx88.h: use IS_ENABLED() macro (diff) | |
| download | linux-8c31522c64968ae790b0d767d27655c24d913837.tar.xz linux-8c31522c64968ae790b0d767d27655c24d913837.zip | |
[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>
Diffstat (limited to 'drivers/media/pci/saa7134')
| -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 @@ #include <media/videobuf-dma-sg.h> #include <sound/core.h> #include <sound/pcm.h> -#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) #include <media/videobuf-dvb.h> #endif @@ -644,7 +644,7 @@ struct saa7134_dev { struct work_struct empress_workqueue; int empress_started; -#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) /* SAA7134_MPEG_DVB only */ struct videobuf_dvb_frontends frontends; int (*original_demod_sleep)(struct dvb_frontend *fe); |