[zaptel-commits] qwell: branch 1.4 r2950 - in /branches/1.4: ./ Makefile.kernel26

[SVN commits to the Zaptel project]

Author: qwell
Date: Fri Aug 24 15:47:55 2007
New Revision: 2950

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

(closes issue #10555)
........
r2949 | qwell | 2007-08-24 15:46:20 -0500 (Fri, 24 Aug 2007) | 4 lines

Fix an issue that caused only MG2 and possibly HPEC to work.

Issue 10555, patch by me.

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/Makefile.kernel26

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

Modified: branches/1.4/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile.kernel26?view=diff&rev=2950&r1=2949&r2=2950
==============================================================================
--- branches/1.4/Makefile.kernel26 (original)
+++ branches/1.4/Makefile.kernel26 Fri Aug 24 15:47:55 2007
@@ -1,7 +1,6 @@
-ifndef ECHO_CAN_NAME
-  ECHO_CAN_NAME	:= MG2
+ifdef ECHO_CAN_NAME
+	ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
 endif
-ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
 
 EXTRA_CFLAGS := -I$(src)
 EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)