diff options
| author | Oliver Endriss <o.endriss@gmx.de> | 2006-09-14 05:15:13 +0200 |
|---|---|---|
| committer | Oliver Endriss <o.endriss@gmx.de> | 2006-09-14 05:15:13 +0200 |
| commit | 399660410cc2fc9bd935e5da1fec76e0fb95d9a2 (patch) | |
| tree | 04109705375cc2201a8ffebe37ecbce776b6f292 | |
| parent | 72be45f522a906250d4995b8bcbe7d2783d528e9 (diff) | |
| download | mediapointer-dvb-s2-399660410cc2fc9bd935e5da1fec76e0fb95d9a2.tar.gz mediapointer-dvb-s2-399660410cc2fc9bd935e5da1fec76e0fb95d9a2.tar.bz2 | |
av7110: FW_LOADER depemdency fixed
From: Oliver Endriss <o.endriss@gmx.de>
Do not select FW_LOADER unless it is really required.
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/Kconfig b/linux/drivers/media/dvb/ttpci/Kconfig index 3f4156f9b..95531a624 100644 --- a/linux/drivers/media/dvb/ttpci/Kconfig +++ b/linux/drivers/media/dvb/ttpci/Kconfig @@ -1,7 +1,7 @@ config DVB_AV7110 tristate "AV7110 cards" depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 - select FW_LOADER + select FW_LOADER if !DVB_AV7110_FIRMWARE select VIDEO_SAA7146_VV select DVB_PLL select DVB_VES1820 if !DVB_FE_CUSTOMISE diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 3a01341fa..de21fde50 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -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) { +#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE) struct av7110* av7110 = (struct av7110*) fe->dvb->priv; return request_firmware(fw, name, &av7110->dev->pci->dev); +#else + return -EINVAL; +#endif } static struct sp8870_config alps_tdlb7_config = { |