diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-22 11:35:33 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-22 11:35:33 +0000 |
| commit | 49a66e309c5c7564027efa4cf823fac6b374a751 (patch) | |
| tree | 567f6b5f8f853468c1ccc7396d387363ac0a8729 /drivers/dahdi/wcte12xp | |
| parent | 796225defc1043e11fc7209e50a20cc896b350e7 (diff) | |
fix up all remaining references to zaptel/zapata (except for the ones in credits that need to be left alone)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4324 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcte12xp')
| -rw-r--r-- | drivers/dahdi/wcte12xp/Kbuild | 6 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/vpmadt032.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dahdi/wcte12xp/Kbuild b/drivers/dahdi/wcte12xp/Kbuild index 9fd642a..31ea38b 100644 --- a/drivers/dahdi/wcte12xp/Kbuild +++ b/drivers/dahdi/wcte12xp/Kbuild @@ -11,8 +11,8 @@ endif wcte12xp-objs := base.o vpmadt032.o GpakApi.o ../voicebus.o ifneq ($(HOTPLUG_FIRMWARE),yes) -wcte12xp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o +wcte12xp-objs += $(FIRM_DIR)/dahdi-fw-vpmadt032.o endif -$(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o - $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o +$(obj)/$(FIRM_DIR)/dahdi-fw-vpmadt032.o: $(obj)/base.o + $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-vpmadt032.o diff --git a/drivers/dahdi/wcte12xp/vpmadt032.c b/drivers/dahdi/wcte12xp/vpmadt032.c index 835cdb5..f8e385b 100644 --- a/drivers/dahdi/wcte12xp/vpmadt032.c +++ b/drivers/dahdi/wcte12xp/vpmadt032.c @@ -697,10 +697,10 @@ void t1_vpm150m_init(struct t1 *wc) { struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void _binary_zaptel_fw_vpmadt032_bin_size; - extern u8 _binary_zaptel_fw_vpmadt032_bin_start[]; + extern void _binary_dahdi_fw_vpmadt032_bin_size; + extern u8 _binary_dahdi_fw_vpmadt032_bin_start[]; #else - static const char vpmadt032_firmware[] = "zaptel-fw-vpmadt032.bin"; + static const char vpmadt032_firmware[] = "dahdi-fw-vpmadt032.bin"; struct pci_dev* pdev = voicebus_get_pci_dev(wc->vb); #endif @@ -840,8 +840,8 @@ void t1_vpm150m_init(struct t1 *wc) { goto failed_exit; } #else - embedded_firmware.data = _binary_zaptel_fw_vpmadt032_bin_start; - embedded_firmware.size = (size_t) &_binary_zaptel_fw_vpmadt032_bin_size; + embedded_firmware.data = _binary_dahdi_fw_vpmadt032_bin_start; + embedded_firmware.size = (size_t) &_binary_dahdi_fw_vpmadt032_bin_size; #endif fw.fw = firmware; fw.offset = 0; |