diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 18:48:26 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 18:48:26 +0200 |
commit | 0337966d121ebebf73a1c346123e8112796e684e (patch) | |
tree | c0d4388591e72dc5a26ee976a9cbca70f6bafbbd /drivers/media/common/b2c2/flexcop-fe-tuner.c | |
parent | Input: i8042 - add Clevo P650RS to the i8042 reset list (diff) | |
parent | Input: ar1021_i2c - use BIT to check for a bit (diff) | |
download | linux-0337966d121ebebf73a1c346123e8112796e684e.tar.xz linux-0337966d121ebebf73a1c346123e8112796e684e.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.12 merge window.
Diffstat (limited to 'drivers/media/common/b2c2/flexcop-fe-tuner.c')
-rw-r--r-- | drivers/media/common/b2c2/flexcop-fe-tuner.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c index f5956402fc69..5f10151ecec9 100644 --- a/drivers/media/common/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c @@ -24,8 +24,7 @@ /* Can we use the specified front-end? Remember that if we are compiled * into the kernel we can't call code that's in modules. */ -#define FE_SUPPORTED(fe) (defined(CONFIG_DVB_##fe) || \ - (defined(CONFIG_DVB_##fe##_MODULE) && defined(MODULE))) +#define FE_SUPPORTED(fe) IS_REACHABLE(CONFIG_DVB_ ## fe) #if FE_SUPPORTED(BCM3510) || (FE_SUPPORTED(CX24120) && FE_SUPPORTED(ISL6421)) static int flexcop_fe_request_firmware(struct dvb_frontend *fe, |