[zaptel-commits] trunk r1244 - in /trunk: ./ Makefile wct4xxp_base.c

[zaptel-commits at lists.digium.com]

Author: file
Date: Wed Jul 19 08:53:35 2006
New Revision: 1244

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

........
r1243 | file | 2006-07-19 09:50:58 -0400 (Wed, 19 Jul 2006) | 2 lines

Only use hotplug firmware loading if the kernel has support for it

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/wct4xxp_base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Wed Jul 19 08:53:35 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235,1236
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1244&r1=1243&r2=1244&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul 19 08:53:35 2006
@@ -157,9 +157,6 @@
 #HOTPLUG_FIRMWARE=no
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 CFLAGS+=-DHOTPLUG_FIRMWARE
-VPM450M_FIRMWARE_HEADER=
-else
-VPM450M_FIRMWARE_HEADER=vpm450m_fw.h
 endif	
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
@@ -191,7 +188,7 @@
 
 linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
 
-linux26: prereq $(VPM450M_FIRMWARE_HEADER) $(BINS)
+linux26: prereq vpm450m_fw.h $(BINS)
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 	$(KMAKE) modules
 

Modified: trunk/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp_base.c?rev=1244&r1=1243&r2=1244&view=diff
==============================================================================
--- trunk/wct4xxp_base.c (original)
+++ trunk/wct4xxp_base.c Wed Jul 19 08:53:35 2006
@@ -43,7 +43,11 @@
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #ifdef HOTPLUG_FIRMWARE
+#ifndef CONFIG_FW_LOADER
+#undef HOTPLUG_FIRMWARE
+#else
 #include <linux/firmware.h>
+#endif
 #endif
 #endif
 #include "wct4xxp.h"