[svn-commits] qwell: trunk r1616 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Nov 17 11:48:24 2006
New Revision: 1616

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

........
r1615 | qwell | 2006-11-17 11:47:36 -0600 (Fri, 17 Nov 2006) | 7 lines

Fix an issue (8071) where wct4xxp wasn't being put into /etc/modprobe.d/zaptel (or similar).

There should be no reason that adding wct4xxp to the MODULES variable at this point in the
Makefile, would cause any harm.  Somebody please correct me if I'm wrong...

(Fix is slightly different from 1.2)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Nov 17 11:48:24 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=1616&r1=1615&r2=1616
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Nov 17 11:48:24 2006
@@ -155,6 +155,7 @@
 obj-m:=$(MODULESO)
 ifeq ($(findstring wct4xxp,$(MENUSELECT_MODULES)),)
 obj-m+=wct4xxp/
+MODULES+=wct4xxp
 endif
 
 # Set this to override hotplug firmware loading and revert to classic header