diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
commit | 6a47a12fee7d1e842369798dc8134759561d5e75 (patch) | |
tree | 14fec57680c2fbc8dc05376b5c14bf57996dc86f /drivers/media/pci/cx23885/altera-ci.h | |
parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
parent | ea5dd38e93b3bec3427e5d3eef000bbf5d637e76 (diff) |
Merge tag 'v3.18.17' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18lsk-v3.18-15.07
Linux 3.18.17
Diffstat (limited to 'drivers/media/pci/cx23885/altera-ci.h')
-rw-r--r-- | drivers/media/pci/cx23885/altera-ci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx23885/altera-ci.h b/drivers/media/pci/cx23885/altera-ci.h index 5028f0cf83f4..6c511723fd1b 100644 --- a/drivers/media/pci/cx23885/altera-ci.h +++ b/drivers/media/pci/cx23885/altera-ci.h @@ -39,7 +39,7 @@ struct altera_ci_config { int (*fpga_rw) (void *dev, int ad_rg, int val, int rw); }; -#if IS_ENABLED(CONFIG_MEDIA_ALTERA_CI) +#if IS_REACHABLE(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); |