[zaptel-commits] branch 1.2 r1243 - in /branches/1.2: Makefile wct4xxp_base.c

[zaptel-commits at lists.digium.com]

Author: file
Date: Wed Jul 19 08:50:58 2006
New Revision: 1243

URL: http://svn.digium.com/view/zaptel?rev=1243&view=rev
Log:
Only use hotplug firmware loading if the kernel has support for it

Modified:
    branches/1.2/Makefile
    branches/1.2/wct4xxp_base.c

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1243&r1=1242&r2=1243&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Jul 19 08:50:58 2006
@@ -87,9 +87,6 @@
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
   CFLAGS+=-DHOTPLUG_FIRMWARE
-  VPM450M_FIRMWARE_HEADER=
-else
-  VPM450M_FIRMWARE_HEADER=vpm450m_fw.h
 endif
 
 # CVS mirrors of SVN have .svnrevision files showing
@@ -144,7 +141,7 @@
 
 linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
 
-linux26: prereq $(VPM450M_FIRMWARE_HEADER) $(BINS)
+linux26: prereq vpm450m_fw.h $(BINS)
 	@echo $(KSRC)
 	@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: branches/1.2/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp_base.c?rev=1243&r1=1242&r2=1243&view=diff
==============================================================================
--- branches/1.2/wct4xxp_base.c (original)
+++ branches/1.2/wct4xxp_base.c Wed Jul 19 08:50:58 2006
@@ -41,7 +41,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"