[svn-commits] kpfleming: branch 1.2 r1891 - /branches/1.2/wct4xxp/base.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 15:12:35 2007
New Revision: 1891

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1891
Log:
make the non-hotplug firmware case actually compile again

Modified:
    branches/1.2/wct4xxp/base.c

Modified: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?view=diff&rev=1891&r1=1890&r2=1891
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Mon Jan 22 15:12:35 2007
@@ -2679,10 +2679,10 @@
 	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) {
@@ -2718,8 +2718,8 @@
 			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:
@@ -2730,8 +2730,8 @@
 			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: