diff options
Diffstat (limited to 'wctc4xxp/base.c')
| -rw-r--r-- | wctc4xxp/base.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/wctc4xxp/base.c b/wctc4xxp/base.c index 47eaa2b..cbdf8b7 100644 --- a/wctc4xxp/base.c +++ b/wctc4xxp/base.c @@ -53,10 +53,7 @@ #endif #ifdef HOTPLUG_FIRMWARE -static const char *dte_firmware = "tc400m-firmware.bin"; -#else -extern u8 _binary_tc400m_firmware_bin_start[]; -extern void _binary_tc400m_firmware_bin_size; +static const char *dte_firmware = "zaptel-fw-tc400m.bin"; #endif @@ -1508,6 +1505,10 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic static int initd_ifaces=0; unsigned char g729_numchannels, g723_numchannels, min_numchannels, dte_firmware_ver; unsigned int complexfmts; +#if !defined(HOTPLUG_FIRMWARE) + extern void _binary_zaptel_fw_tc400m_bin_size; + extern u8 _binary_zaptel_fw_tc400m_bin_start[]; +#endif struct firmware embedded_firmware = { #if !defined(HOTPLUG_FIRMWARE) /* Yes... this is weird. objcopy gives us a symbol containing @@ -1516,8 +1517,8 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic is to take its address, so we define it as a pointer and then cast that value to the proper type. */ - .size = (size_t) &_binary_tc400m_firmware_bin_size, - .data = _binary_tc400m_firmware_bin_start, + .size = (size_t) &_binary_zaptel_fw_tc400m_bin_size, + .data = _binary_zaptel_fw_tc400m_bin_start, #endif }; const struct firmware *firmware = &embedded_firmware; |