Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed

Browse Source 
Do not select FW_LOADER unless it is really required.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Oliver Endriss 2006-09-14 00:15:13 -03:00 committed by Mauro Carvalho Chehab
parent b04c1baf48
commit d98821e21e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/dvb/ttpci/Kconfig
View File

@ -1,7 +1,7 @@
config DVB_AV7110 config DVB_AV7110
tristate "AV7110 cards" tristate "AV7110 cards"
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select FW_LOADER select FW_LOADER if !DVB_AV7110_FIRMWARE
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select DVB_PLL select DVB_PLL
select DVB_VES1820 if !DVB_FE_CUSTOMISE select DVB_VES1820 if !DVB_FE_CUSTOMISE

4
drivers/media/dvb/ttpci/av7110.c
View File

@ -1701,9 +1701,13 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name) static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
{ {
#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE)
struct av7110* av7110 = (struct av7110*) fe->dvb->priv; struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
return request_firmware(fw, name, &av7110->dev->pci->dev); return request_firmware(fw, name, &av7110->dev->pci->dev);
#else
return -EINVAL;
#endif
} }
static struct sp8870_config alps_tdlb7_config = { static struct sp8870_config alps_tdlb7_config = {