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/wctdm24xxp | |
| 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/wctdm24xxp')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/GpakApi.c | 3 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/GpakCust.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/Kbuild | 7 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/Makefile | 21 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/wctdm24xxp.h | 4 |
6 files changed, 11 insertions, 32 deletions
diff --git a/drivers/dahdi/wctdm24xxp/GpakApi.c b/drivers/dahdi/wctdm24xxp/GpakApi.c index 9997b07..847bbb6 100644 --- a/drivers/dahdi/wctdm24xxp/GpakApi.c +++ b/drivers/dahdi/wctdm24xxp/GpakApi.c @@ -36,7 +36,8 @@ #include <linux/version.h> #include <asm/semaphore.h> -#include "zaptel.h" +#include <dahdi/kernel.h> +#include <dahdi/user.h> #include "GpakHpi.h" #include "GpakCust.h" diff --git a/drivers/dahdi/wctdm24xxp/GpakCust.c b/drivers/dahdi/wctdm24xxp/GpakCust.c index 23f2096..b92cfc8 100644 --- a/drivers/dahdi/wctdm24xxp/GpakCust.c +++ b/drivers/dahdi/wctdm24xxp/GpakCust.c @@ -39,7 +39,9 @@ #include <linux/delay.h> #include <asm/semaphore.h> -#include "zaptel.h" +#include <dahdi/kernel.h> +#include <dahdi/user.h> + #include "wctdm24xxp.h" #include "GpakCust.h" diff --git a/drivers/dahdi/wctdm24xxp/Kbuild b/drivers/dahdi/wctdm24xxp/Kbuild index 6698a87..b2699e2 100644 --- a/drivers/dahdi/wctdm24xxp/Kbuild +++ b/drivers/dahdi/wctdm24xxp/Kbuild @@ -16,10 +16,3 @@ endif $(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o - -$(obj)/base.o: $(src)/GpakCust.h $(src)/wctdm24xxp.h -$(obj)/base.o: $(src)/../zaptel.h - -$(obj)/GpakCust.o: $(src)/GpakCust.h - -$(obj)/GpakApi.o: $(src)/GpakApi.h diff --git a/drivers/dahdi/wctdm24xxp/Makefile b/drivers/dahdi/wctdm24xxp/Makefile index 9c4cd51..56453cb 100644 --- a/drivers/dahdi/wctdm24xxp/Makefile +++ b/drivers/dahdi/wctdm24xxp/Makefile @@ -3,25 +3,4 @@ ifneq ($(KBUILD_EXTMOD),) # For newer kernels, Kbuild will be included directly by the kernel # build system. include $(src)/Kbuild - -else - -all: wctdm24xxp.o - -%.o: %.c - $(CC) $(KFLAGS) -o $@ -c $< - -base.o: ../zaptel.h GpakCust.h ../wctdm.h - -GpakCust.o: GpakCust.h - -../firmware/zaptel-fw-vpmadt032.o: base.o - $(MAKE) -C ../firmware zaptel-fw-vpmadt032.o - -wctdm24xxp.o: base.o GpakCust.o GpakApi.o ../firmware/zaptel-fw-vpmadt032.o - $(LD) -r -o $@ $^ - -clean: - rm -f *.o - endif diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 2a0f550..4ca1353 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -50,7 +50,9 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00 db #include <linux/moduleparam.h> #endif -#include "zaptel.h" +#include <dahdi/kernel.h> +#include <dahdi/user.h> + #include "proslic.h" #include "wctdm.h" diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h index 30e4fb9..87c8dee 100644 --- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h +++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h @@ -27,7 +27,9 @@ #ifndef _WCTDM24XXP_H #define _WCTDM24XXP_H -#include "../zaptel.h" +#include <dahdi/kernel.h> +#include <dahdi/user.h> + #include "../voicebus.h" #include <asm/semaphore.h> |