[zaptel-commits] file: trunk r2234 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: file
Date: Mon Feb 26 12:23:15 2007
New Revision: 2234

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2234
Log:
Merged revisions 2233 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2233 | file | 2007-02-26 13:20:40 -0500 (Mon, 26 Feb 2007) | 10 lines

Merged revisions 2232 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2232 | file | 2007-02-26 13:18:13 -0500 (Mon, 26 Feb 2007) | 2 lines

Just in case... set hotplug firmware loading option to no if on a 2.4 kernel. (issue #9140 reported by velter)

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
            ('branch-1.2-merged' removed)

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2234&r1=2233&r2=2234
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Feb 26 12:23:15 2007
@@ -138,6 +138,8 @@
 MODULESKO:=$(MODULES:%=%.ko)
 ifeq ($(BUILDVER),linux26)
 HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
+else
+HOTPLUG_FIRMWARE:=no
 endif
 
 BIN_DIR:=$(INSTALL_PREFIX)/sbin