summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJemma Denson <jdenson@gmail.com>2015-05-21 06:29:23 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-06-09 18:37:56 -0300
commit4b7574fb3cac1507b12af9f8e22d50cd1ec9673b (patch)
tree3e8bbdeb25cdf0e0acb2435ef9894aba5f75d20e
parenteee1d06dc2ac81bc6307326f286932c04136c1af (diff)
downloadlinux-4b7574fb3cac1507b12af9f8e22d50cd1ec9673b.tar.bz2
[media] b2c2: Mismatch in config ifdefs for SkystarS2
Compilation warning issued by kbuild test robot: >> drivers/media/common/b2c2/flexcop-fe-tuner.c:31:12: warning: 'flexcop_fe_request_firmware' defined but not used [-Wunused-function] static int flexcop_fe_request_firmware(struct dvb_frontend *fe, This patch fixes a mismatch in Kconfig define checks. One had a check for just CX24120, the other is checking for both CX24120 and ISL6421. Signed-off-by: Jemma Denson <jdenson@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/common/b2c2/flexcop-fe-tuner.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c
index 5e5696729eca..b4e545956c2d 100644
--- a/drivers/media/common/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c
@@ -27,7 +27,7 @@
#define FE_SUPPORTED(fe) (defined(CONFIG_DVB_##fe) || \
(defined(CONFIG_DVB_##fe##_MODULE) && defined(MODULE)))
-#if FE_SUPPORTED(BCM3510) || FE_SUPPORTED(CX24120)
+#if FE_SUPPORTED(BCM3510) || (FE_SUPPORTED(CX24120) && FE_SUPPORTED(ISL6421))
static int flexcop_fe_request_firmware(struct dvb_frontend *fe,
const struct firmware **fw, char *name)
{