[zaptel-commits] file: branch 1.2 r1444 - in /branches/1.2: Makefile wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: file
Date: Fri Sep  8 18:49:43 2006
New Revision: 1444

URL: http://svn.digium.com/view/zaptel?rev=1444&view=rev
Log:
Move CONFIG_FW_LOADER check to Makefile (reported internally by Spiceland)

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=1444&r1=1443&r2=1444&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Sep  8 18:49:43 2006
@@ -69,7 +69,7 @@
     DYNFS=yes
     UDEVRULES=yes
   endif
-  HOTPLUG_FIRMWARE:=yes
+  HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
 endif
 
 CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)

Modified: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?rev=1444&r1=1443&r2=1444&view=diff
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Fri Sep  8 18:49:43 2006
@@ -41,11 +41,7 @@
 #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"