diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-22 21:14:29 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-22 21:14:29 +0000 |
| commit | 587483cd62d0a53545f3380763dc89453e7110e1 (patch) | |
| tree | 4d7fcd48a6f4e1985b3449d88ef620d2dfce25d9 /wct4xxp | |
| parent | dc9634d8170e7d1d64d1c3325663d672b28c177f (diff) | |
Merged revisions 1892 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1892 | kpfleming | 2007-01-22 15:13:37 -0600 (Mon, 22 Jan 2007) | 10 lines
Merged revisions 1891 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1891 | kpfleming | 2007-01-22 15:12:35 -0600 (Mon, 22 Jan 2007) | 2 lines
make the non-hotplug firmware case actually compile again
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1893 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
| -rw-r--r-- | wct4xxp/base.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index e084be3..983be75 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3107,10 +3107,10 @@ static void t4_vpm450_init(struct t4 *wc) struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern const u32 _binary_OCT6114_64D_size; - extern const u32 _binary_OCT6114_128D_size; - extern const u8 *_binary_OCT6114_64D_start; - extern const u8 *_binary_OCT6114_128D_start; + extern const u32 _binary_OCT6114_64D_ima_size; + extern const u32 _binary_OCT6114_128D_ima_size; + extern u8 _binary_OCT6114_64D_ima_start; + extern u8 _binary_OCT6114_128D_ima_start; #endif if (!vpmsupport) { @@ -3146,8 +3146,8 @@ static void t4_vpm450_init(struct t4 *wc) return; } #else - embedded_firmware.data = _binary_OCT6114D_64D_ima_start; - embedded_firmware.size = _binary_OCT6114D_64D_ima_start; + embedded_firmware.data = &_binary_OCT6114_64D_ima_start; + embedded_firmware.size = _binary_OCT6114_64D_ima_size; #endif break; case 128: @@ -3158,8 +3158,8 @@ static void t4_vpm450_init(struct t4 *wc) return; } #else - embedded_firmware.data = _binary_OCT6114D_128D_ima_start; - embedded_firmware.size = _binary_OCT6114D_128D_ima_start; + embedded_firmware.data = &_binary_OCT6114_128D_ima_start; + embedded_firmware.size = _binary_OCT6114_128D_ima_size; #endif break; default: |