[zaptel-commits] file: trunk r1445 - in /trunk: ./ Makefile wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: file
Date: Fri Sep  8 18:52:34 2006
New Revision: 1445

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

........
r1444 | file | 2006-09-08 19:49:43 -0400 (Fri, 08 Sep 2006) | 2 lines

Move CONFIG_FW_LOADER check to Makefile (reported internally by Spiceland)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/wct4xxp/base.c

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1445&r1=1444&r2=1445&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Sep  8 18:52:34 2006
@@ -142,7 +142,7 @@
 MODULESKO:=$(MODULES:%=%.ko)
 ifeq ($(BUILDVER),linux26)
 MODULES_BUILD:=$(MODULESKO)
-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)
 else
 MODULES_BUILD:=$(MODULESO)
 endif

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