diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-21 16:22:34 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-21 16:22:34 +0000 |
| commit | a33ae91627f1dba54d785056ee2ea6541adfc8fa (patch) | |
| tree | a18c0175ffffd84b7a504ae069f9ce160ba778c6 /drivers/dahdi/wctc4xxp | |
| parent | 2f2178e2dc43ae074eb1c12f89956c9718dac807 (diff) | |
modules build now
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4318 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctc4xxp')
| -rw-r--r-- | drivers/dahdi/wctc4xxp/Kbuild | 2 | ||||
| -rw-r--r-- | drivers/dahdi/wctc4xxp/Makefile | 2 | ||||
| -rw-r--r-- | drivers/dahdi/wctc4xxp/base.c | 5 | ||||
| -rw-r--r-- | drivers/dahdi/wctc4xxp/codec_test.c | 8 |
4 files changed, 8 insertions, 9 deletions
diff --git a/drivers/dahdi/wctc4xxp/Kbuild b/drivers/dahdi/wctc4xxp/Kbuild index 353290f..9684569 100644 --- a/drivers/dahdi/wctc4xxp/Kbuild +++ b/drivers/dahdi/wctc4xxp/Kbuild @@ -14,7 +14,5 @@ ifneq ($(HOTPLUG_FIRMWARE),yes) wctc4xxp-objs += $(FIRM_DIR)/zaptel-fw-tc400m.o endif -$(obj)/base.o: $(src)/../zaptel.h - $(obj)/$(FIRM_DIR)/zaptel-fw-tc400m.o: $(obj)/base.o $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-tc400m.o diff --git a/drivers/dahdi/wctc4xxp/Makefile b/drivers/dahdi/wctc4xxp/Makefile index 725abc4..6a48fc9 100644 --- a/drivers/dahdi/wctc4xxp/Makefile +++ b/drivers/dahdi/wctc4xxp/Makefile @@ -8,7 +8,7 @@ else tests: codec_test -codec_test: codec_test.c ../zaptel.h +codec_test: codec_test.c ../../include/dahdi/kernel.h ../../include/dahdi/user.h $(CC) -o $@ $< $(CFLAGS) clean: diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 4845c6b..16043d1 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -46,7 +46,10 @@ #ifdef CONFIG_DEVFS_FS #include <linux/devfs_fs_kernel.h> #endif -#include "zaptel.h" + +#include <dahdi/kernel.h> +#include <dahdi/user.h> + /* #define USE_TEST_HW */ #define USE_TDM_CONFIG diff --git a/drivers/dahdi/wctc4xxp/codec_test.c b/drivers/dahdi/wctc4xxp/codec_test.c index 287979d..85a1d41 100644 --- a/drivers/dahdi/wctc4xxp/codec_test.c +++ b/drivers/dahdi/wctc4xxp/codec_test.c @@ -35,11 +35,9 @@ #include <errno.h> #include <sys/mman.h> #include <unistd.h> -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include <linux/zaptel.h> -#endif + +#include <dahdi/kernel.h> +#include <dahdi/user.h> #define MAX_CARDS_TO_TEST 6 #define MAX_CHANNELS_PER_CARD 96 |