[svn-commits] kpfleming: branch 1.4 r1988 - in /branches/1.4: ./ wct4xxp/base.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Jan 27 10:16:03 2007
New Revision: 1988

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1988
Log:
Merged revisions 1987 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1987 | kpfleming | 2007-01-27 10:14:54 -0600 (Sat, 27 Jan 2007) | 2 lines

properly reference the size symbol produced by objcopy

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wct4xxp/base.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/base.c?view=diff&rev=1988&r1=1987&r2=1988
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Sat Jan 27 10:16:03 2007
@@ -3102,8 +3102,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern const u32 _binary_OCT6114_64D_ima_size;
-	extern const u32 _binary_OCT6114_128D_ima_size;
+	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
@@ -3142,7 +3142,7 @@
 		}
 #else
 		embedded_firmware.data = _binary_OCT6114_64D_ima_start;
-		embedded_firmware.size = _binary_OCT6114_64D_ima_size;
+		embedded_firmware.size = *_binary_OCT6114_64D_ima_size;
 #endif
 		break;
 	case 128:
@@ -3154,7 +3154,7 @@
 		}
 #else
 		embedded_firmware.data = _binary_OCT6114_128D_ima_start;
-		embedded_firmware.size = _binary_OCT6114_128D_ima_size;
+		embedded_firmware.size = *_binary_OCT6114_128D_ima_size;
 #endif
 		break;
 	default: