diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-08 00:31:41 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-08 00:31:41 +0000 |
| commit | 68c01fc56240dc25898e4b2b4f97b7ce6f8e758f (patch) | |
| tree | 51a0f7eacff446d617a62e76bdcdf48890bec1fe /xpp | |
| parent | 8631091e837445a89dcc7230ba60f6ca493231ed (diff) | |
just #include "zaptel.h". No STANDALONE_ZAPATA or other strange stuff.
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1211 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp')
| -rw-r--r-- | xpp/Makefile | 2 | ||||
| -rw-r--r-- | xpp/xpp_zap.c | 6 | ||||
| -rw-r--r-- | xpp/zap_debug.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/xpp/Makefile b/xpp/Makefile index 6b32add..cce22ad 100644 --- a/xpp/Makefile +++ b/xpp/Makefile @@ -1,4 +1,4 @@ -EXTRA_CFLAGS = -I$(SUBDIRS) -DDEBUG -DPOLL_DIGITAL_INPUTS -DWITH_ECHO_SUPPRESSION -DWITH_RBS -DSTANDALONE_ZAPATA +EXTRA_CFLAGS = -I$(SUBDIRS) -DDEBUG -DPOLL_DIGITAL_INPUTS -DWITH_ECHO_SUPPRESSION -DWITH_RBS obj-m = xpp.o xpp_usb.o xpd_fxs.o xpd_fxo.o xpp-y += xbus-core.o xpp_zap.o xproto.o card_global.o diff --git a/xpp/xpp_zap.c b/xpp/xpp_zap.c index 4209fda..fc61af0 100644 --- a/xpp/xpp_zap.c +++ b/xpp/xpp_zap.c @@ -39,11 +39,7 @@ #include <linux/workqueue.h> #include <linux/proc_fs.h> -#ifdef STANDALONE_ZAPATA -#include "../zaptel.h" -#else -#include <zaptel/zaptel.h> -#endif +#include "zaptel.h" #include <version.h> /* For zaptel version */ #include "xbus-core.h" diff --git a/xpp/zap_debug.c b/xpp/zap_debug.c index 59eb0a8..f20e14d 100644 --- a/xpp/zap_debug.c +++ b/xpp/zap_debug.c @@ -28,7 +28,7 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/module.h> -#include <zaptel.h> +#include "zaptel.h" #include "zap_debug.h" static const char rcsid[] = "$Id$"; |