From: Jemma Denson Date: Thu, 21 May 2015 09:29:23 +0000 (-0300) Subject: [media] b2c2: Mismatch in config ifdefs for SkystarS2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4b7574fb3cac1507b12af9f8e22d50cd1ec9673b;p=linux-beck.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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) {