[zaptel-commits] kpfleming: branch 1.4 r3823 - in /branches/1.4/kernel/wctc4xxp: Kbuild base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Tue Feb 12 18:34:15 2008
New Revision: 3823

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3823
Log:
remove some STANDALONE_ZAPATA stuff that is not needed


Modified:
    branches/1.4/kernel/wctc4xxp/Kbuild
    branches/1.4/kernel/wctc4xxp/base.c

Modified: branches/1.4/kernel/wctc4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/Kbuild?view=diff&rev=3823&r1=3822&r2=3823
==============================================================================
--- branches/1.4/kernel/wctc4xxp/Kbuild (original)
+++ branches/1.4/kernel/wctc4xxp/Kbuild Tue Feb 12 18:34:15 2008
@@ -2,7 +2,7 @@
 
 FIRM_DIR	:= ../../firmware
 
-EXTRA_CFLAGS := -I$(src)/.. -Wno-undef -DSTANDALONE_ZAPATA
+EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=3823&r1=3822&r2=3823
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Tue Feb 12 18:34:15 2008
@@ -46,11 +46,7 @@
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
 #endif
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
 
 /* #define USE_TEST_HW */
 #define USE_TDM_CONFIG