diff options
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 480752351..89283bd6a 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -4501,12 +4501,20 @@ static struct saa7146_ext_vv av7110_vv_data_st; static struct saa7146_ext_vv av7110_vv_data_c; #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) +#define CONFIG_DVB_AV7110_FIRMWARE_FILE +#endif + +#ifdef CONFIG_DVB_AV7110_FIRMWARE_FILE #include "av7110_firm.h" #endif static int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext) { +#ifndef CONFIG_DVB_AV7110_FIRMWARE_FILE + const struct firmware *fw; +#else struct firmware *fw; +#endif struct av7110 *av7110 = NULL; int ret = 0; u32 crc = 0, len = 0; @@ -4514,7 +4522,7 @@ static int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_ DEB_EE(("dev: %p, av7110: %p\n",dev,av7110)); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)) +#ifndef CONFIG_DVB_AV7110_FIRMWARE_FILE /* request the av7110 firmware, this will block until someone uploads it */ ret = request_firmware(&fw, "dvb-ttpci-01.fw", &dev->pci->dev); if ( 0 != ret ) { |