diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-31 01:34:25 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-31 01:34:25 +0000 |
| commit | bcb145f581a1dd4913dd99b738b2177c9ba6add2 (patch) | |
| tree | 20858e7c67f6b84fd577962c32a7e39a6230341d | |
| parent | a5da059f5b25a4f04b923cb29e16b5023b66533e (diff) | |
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/branches/1.4@2039 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -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 ae82d71..6a219d4 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3102,8 +3102,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 @@ -3148,7 +3148,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: @@ -3166,7 +3166,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: |