diff options
author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-09 16:56:03 +0000 |
---|---|---|
committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-09 16:56:03 +0000 |
commit | 364b6058dd2e8e375f9e8b191815bfafb64b5a58 (patch) | |
tree | b766211338822acb34587d0574ae25ee6ae6e71e /wct4xxp | |
parent | 2fe01ba652d0949f3a46db252f3173dd223b40c2 (diff) |
Merged revisions 2136 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r2136 | file | 2007-02-09 11:53:31 -0500 (Fri, 09 Feb 2007) | 2 lines
Drop the need for header files by using non-versioned binary files.
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2137 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
-rw-r--r-- | wct4xxp/base.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 3f0f8d4..03c2c48 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -48,11 +48,6 @@ #include "wct4xxp.h" #include "vpm450m.h" -#ifdef HOTPLUG_FIRMWARE -#include "../firmware/zaptel-fw-oct6114-064.h" -#include "../firmware/zaptel-fw-oct6114-128.h" -#endif - /* * Tasklets provide better system interactive response at the cost of the * possibility of losing a frame of data at very infrequent intervals. If @@ -3140,9 +3135,9 @@ static void t4_vpm450_init(struct t4 *wc) switch ((vpm_capacity = get_vpm450m_capacity(wc))) { case 64: #if defined(HOTPLUG_FIRMWARE) - if ((request_firmware(&firmware, zaptel_fw_oct6114_064, &wc->dev->dev) != 0) || + if ((request_firmware(&firmware, "zaptel-fw-oct6114-064.bin", &wc->dev->dev) != 0) || !firmware) { - printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_064); + printk("VPM450: firmware zaptel-fw-oct6114-064.bin not available from userspace\n"); return; } #else @@ -3158,9 +3153,9 @@ static void t4_vpm450_init(struct t4 *wc) break; case 128: #if defined(HOTPLUG_FIRMWARE) - if ((request_firmware(&firmware, zaptel_fw_oct6114_128, &wc->dev->dev) != 0) || + if ((request_firmware(&firmware, "zaptel-fw-oct6114-128.bin", &wc->dev->dev) != 0) || !firmware) { - printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_128); + printk("VPM450: firmware zaptel-fw-oct6114-128.bin not available from userspace\n"); return; } #else |