[zaptel-commits] kpfleming: branch 1.2 r2193 - /branches/1.2/Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Feb 21 07:59:57 2007
New Revision: 2193

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2193
Log:
move this comment to before the first place HOTPLUG_FIRMWARE gets set

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2193&r1=2192&r2=2193
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Feb 21 07:59:57 2007
@@ -33,6 +33,8 @@
   BUILDVER:=linux24
 endif
 
+# Set HOTPLUG_FIRMWARE=no to override automatic building with hotplug support
+# if it is enabled in the kernel.
 ifeq ($(BUILDVER),linux26)
   ifneq (,$(wildcard $(INSTALL_PREFIX)/etc/udev/rules.d))
     DYNFS=yes
@@ -40,9 +42,6 @@
   endif
   HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
 endif
-
-# Set this to override hotplug firmware loading and revert to embedded firmware
-HOTPLUG_FIRMWARE?=yes
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
   CFLAGS+=-DHOTPLUG_FIRMWARE