[zaptel-commits] mattf: trunk r2763 - in /trunk: ./ wctdm24xxp/

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Jul 20 14:14:09 2007
New Revision: 2763

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

................
r2762 | mattf | 2007-07-20 13:54:20 -0500 (Fri, 20 Jul 2007) | 9 lines

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

........
r2761 | mattf | 2007-07-20 11:19:47 -0500 (Fri, 20 Jul 2007) | 1 line

New product support, new echo canceler and new boards
........

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

Added:
    trunk/wctdm24xxp/
      - copied from r2762, branches/1.4/wctdm24xxp/
    trunk/wctdm24xxp/GpakApi.c
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/GpakApi.c
    trunk/wctdm24xxp/GpakApi.h
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/GpakApi.h
    trunk/wctdm24xxp/GpakCust.c
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/GpakCust.c
    trunk/wctdm24xxp/GpakCust.h
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/GpakCust.h
    trunk/wctdm24xxp/GpakHpi.h
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/GpakHpi.h
    trunk/wctdm24xxp/Makefile
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/Makefile
    trunk/wctdm24xxp/Makefile.kernel26
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/Makefile.kernel26
    trunk/wctdm24xxp/VPMADT032.bin
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/VPMADT032.bin
    trunk/wctdm24xxp/base.c
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/base.c
    trunk/wctdm24xxp/gpakErrs.h
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/gpakErrs.h
    trunk/wctdm24xxp/gpakenum.h
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/gpakenum.h
    trunk/wctdm24xxp/wctdm24xxp.h
      - copied unchanged from r2762, branches/1.4/wctdm24xxp/wctdm24xxp.h
Removed:
    trunk/wctdm24xxp.c
Modified:
    trunk/   (props changed)
    trunk/Makefile

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=2763&r1=2762&r2=2763
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Jul 20 14:14:09 2007
@@ -125,7 +125,7 @@
  endif
 endif
 
-MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
+MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
 MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
 MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
@@ -160,6 +160,11 @@
 MODULES+=xpp
 endif
 
+ifeq ($(findstring wctdm24xxp,$(MENUSELECT_MODULES)),)
+obj-m+=wctdm24xxp/
+MODULES+=wctdm24xxp
+endif
+
 # Set this to override hotplug firmware loading and revert to classic header
 #HOTPLUG_FIRMWARE=no
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -219,8 +224,6 @@
 wcfxsusb.o: wcfxsusb.h
 
 wctdm.o: wctdm.h
-
-wctdm24xxp.o: wctdm.h
 
 pciradio.o: radfw.h