diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-21 16:29:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-23 09:29:10 -0300 |
| commit | 1c59390b3b551524d4c8415bd39c9c788705c7c0 (patch) | |
| tree | 77160bf86afdc72728631bada58729def118bf8e /drivers/media | |
| parent | 9dc353c67cbe3150d3a6b293662d5a33028adec4 (diff) | |
| download | linux-3.10-1c59390b3b551524d4c8415bd39c9c788705c7c0.tar.gz linux-3.10-1c59390b3b551524d4c8415bd39c9c788705c7c0.tar.bz2 linux-3.10-1c59390b3b551524d4c8415bd39c9c788705c7c0.zip | |
[media] cx23885: use IS_ENABLED
Instead of checking everywhere there for 3 symbols, use instead
IS_ENABLED macro.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/pci/cx23885/altera-ci.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/pci/cx23885/altera-ci.h b/drivers/media/pci/cx23885/altera-ci.h index 70e4fd69ad9..4998c96caeb 100644 --- a/drivers/media/pci/cx23885/altera-ci.h +++ b/drivers/media/pci/cx23885/altera-ci.h @@ -24,6 +24,8 @@ #ifndef __ALTERA_CI_H #define __ALTERA_CI_H +#include <linux/kconfig.h> + #define ALT_DATA 0x000000ff #define ALT_TDI 0x00008000 #define ALT_TDO 0x00004000 @@ -41,8 +43,7 @@ struct altera_ci_config { int (*fpga_rw) (void *dev, int ad_rg, int val, int rw); }; -#if defined(CONFIG_MEDIA_ALTERA_CI) || (defined(CONFIG_MEDIA_ALTERA_CI_MODULE) \ - && defined(MODULE)) +#if IS_ENABLED(CONFIG_MEDIA_ALTERA_CI) extern int altera_ci_init(struct altera_ci_config *config, int ci_nr); extern void altera_ci_release(void *dev, int ci_nr); |