diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-31 01:35:26 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-31 01:35:26 +0000 |
| commit | 91920afe94f0ef98ac491b1124c4a4d28c6a268b (patch) | |
| tree | 0036ed9160345d88883cde752057acebdfb00b6e /wct4xxp | |
| parent | 54d2cc8faca6484b6208edff542c010250c7e5e8 (diff) | |
Merged revisions 2039 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r2039 | kpfleming | 2007-01-30 19:34:25 -0600 (Tue, 30 Jan 2007) | 10 lines
Merged revisions 2038 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2038 | kpfleming | 2007-01-30 19:33:25 -0600 (Tue, 30 Jan 2007) | 2 lines
final fix for non-hotplug firmware loading
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2040 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
| -rw-r--r-- | wct4xxp/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 8357ec4..1419607 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3107,8 +3107,8 @@ static void t4_vpm450_init(struct t4 *wc) struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void *_binary_OCT6114_64D_ima_size; - extern void *_binary_OCT6114_128D_ima_size; + extern void _binary_OCT6114_64D_ima_size; + extern void _binary_OCT6114_128D_ima_size; extern u8 _binary_OCT6114_64D_ima_start[]; extern u8 _binary_OCT6114_128D_ima_start[]; #endif @@ -3153,7 +3153,7 @@ static void t4_vpm450_init(struct t4 *wc) is to take its address, so we define it as a pointer and then cast that value to the proper type. */ - embedded_firmware.size = (size_t) _binary_OCT6114_64D_ima_size; + embedded_firmware.size = (size_t) &_binary_OCT6114_64D_ima_size; #endif break; case 128: @@ -3171,7 +3171,7 @@ static void t4_vpm450_init(struct t4 *wc) is to take its address, so we define it as a pointer and then cast that value to the proper type. */ - embedded_firmware.size = (size_t) _binary_OCT6114_128D_ima_size; + embedded_firmware.size = (size_t) &_binary_OCT6114_128D_ima_size; #endif break; default: |