From 49a66e309c5c7564027efa4cf823fac6b374a751 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 22 May 2008 11:35:33 +0000 Subject: 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 --- drivers/dahdi/wctc4xxp/Kbuild | 6 +++--- drivers/dahdi/wctc4xxp/base.c | 10 +++++----- drivers/dahdi/wctc4xxp/codec_test.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/dahdi/wctc4xxp') diff --git a/drivers/dahdi/wctc4xxp/Kbuild b/drivers/dahdi/wctc4xxp/Kbuild index 9684569..de426cf 100644 --- a/drivers/dahdi/wctc4xxp/Kbuild +++ b/drivers/dahdi/wctc4xxp/Kbuild @@ -11,8 +11,8 @@ endif wctc4xxp-objs := base.o ifneq ($(HOTPLUG_FIRMWARE),yes) -wctc4xxp-objs += $(FIRM_DIR)/zaptel-fw-tc400m.o +wctc4xxp-objs += $(FIRM_DIR)/dahdi-fw-tc400m.o endif -$(obj)/$(FIRM_DIR)/zaptel-fw-tc400m.o: $(obj)/base.o - $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-tc400m.o +$(obj)/$(FIRM_DIR)/dahdi-fw-tc400m.o: $(obj)/base.o + $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-tc400m.o diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index f6b9c98..8f71f07 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -1664,10 +1664,10 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void _binary_zaptel_fw_tc400m_bin_size; - extern u8 _binary_zaptel_fw_tc400m_bin_start[]; + extern void _binary_dahdi_fw_tc400m_bin_size; + extern u8 _binary_dahdi_fw_tc400m_bin_start[]; #else - static const char tc400m_firmware[] = "zaptel-fw-tc400m.bin"; + static const char tc400m_firmware[] = "dahdi-fw-tc400m.bin"; #endif if (!initd_ifaces) { @@ -1754,8 +1754,8 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic return -EIO; } #else - embedded_firmware.data = _binary_zaptel_fw_tc400m_bin_start; - embedded_firmware.size = (size_t) &_binary_zaptel_fw_tc400m_bin_size; + embedded_firmware.data = _binary_dahdi_fw_tc400m_bin_start; + embedded_firmware.size = (size_t) &_binary_dahdi_fw_tc400m_bin_size; #endif dte_firmware_ver = firmware->data[0]; diff --git a/drivers/dahdi/wctc4xxp/codec_test.c b/drivers/dahdi/wctc4xxp/codec_test.c index abea9e9..c9c2897 100644 --- a/drivers/dahdi/wctc4xxp/codec_test.c +++ b/drivers/dahdi/wctc4xxp/codec_test.c @@ -1,5 +1,5 @@ /* - * Wilcard TC400B Digium Transcoder Engine Interface Driver for Zapata Telephony interface test tool. + * Wilcard TC400B Digium Transcoder Engine Interface Driver for DAHDI Telephony interface test tool. * * Written by Matt O'Gorman * -- cgit v1.2.3