From a33ae91627f1dba54d785056ee2ea6541adfc8fa Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 21 May 2008 16:22:34 +0000
Subject: modules build now

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4318 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 drivers/dahdi/wcte12xp/GpakApi.c   |  3 ++-
 drivers/dahdi/wcte12xp/Kbuild      |  7 -------
 drivers/dahdi/wcte12xp/Makefile    | 19 -------------------
 drivers/dahdi/wcte12xp/base.c      |  3 ++-
 drivers/dahdi/wcte12xp/vpmadt032.c |  4 +++-
 5 files changed, 7 insertions(+), 29 deletions(-)

(limited to 'drivers/dahdi/wcte12xp')

diff --git a/drivers/dahdi/wcte12xp/GpakApi.c b/drivers/dahdi/wcte12xp/GpakApi.c
index 944c327..b0fd8bf 100644
--- a/drivers/dahdi/wcte12xp/GpakApi.c
+++ b/drivers/dahdi/wcte12xp/GpakApi.c
@@ -33,7 +33,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  */
 
-#include "zaptel.h"
+#include <dahdi/kernel.h>
+#include <dahdi/user.h>
 
 #include "GpakHpi.h"
 #include "vpmadt032.h"
diff --git a/drivers/dahdi/wcte12xp/Kbuild b/drivers/dahdi/wcte12xp/Kbuild
index 5df6b9b..9fd642a 100644
--- a/drivers/dahdi/wcte12xp/Kbuild
+++ b/drivers/dahdi/wcte12xp/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)/vpmadt032.h $(src)/wcte12xp.h
-$(obj)/base.o: $(src)/../zaptel.h
-
-$(obj)/vpmadt032.o: $(src)/vpmadt032.h
-
-$(obj)/GpakApi.o: $(src)/GpakApi.h
diff --git a/drivers/dahdi/wcte12xp/Makefile b/drivers/dahdi/wcte12xp/Makefile
index fb0fbc5..56453cb 100644
--- a/drivers/dahdi/wcte12xp/Makefile
+++ b/drivers/dahdi/wcte12xp/Makefile
@@ -3,23 +3,4 @@ ifneq ($(KBUILD_EXTMOD),)
 # For newer kernels, Kbuild will be included directly by the kernel
 # build system.
 include $(src)/Kbuild
-
-else
-
-# building for 2.4 kernels means no VPM support, so none of the VPM support
-# modules are included in the Makefile rules
-
-all: wcte12xp.o
-
-%.o: %.c
-	$(CC) $(KFLAGS) -o $@ -c $<
-
-base.o: ../zaptel.h
-
-wcte12xp.o: base.o
-	$(LD) -r -o $@ $^
-
-clean:
-	rm -f *.o
-
 endif
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index b08d4ac..0c5e840 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -40,7 +40,8 @@
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
+#include <dahdi/kernel.h>
+#include <dahdi/user.h>
 
 #include "../wct4xxp/wct4xxp.h"	/* For certain definitions */
 
diff --git a/drivers/dahdi/wcte12xp/vpmadt032.c b/drivers/dahdi/wcte12xp/vpmadt032.c
index 141b000..b22d322 100644
--- a/drivers/dahdi/wcte12xp/vpmadt032.c
+++ b/drivers/dahdi/wcte12xp/vpmadt032.c
@@ -34,7 +34,9 @@
 #include <linux/firmware.h> 
 #include <linux/list.h> 
 
-#include "zaptel.h"
+#include <dahdi/kernel.h>
+#include <dahdi/user.h>
+
 #include "voicebus.h"
 
 #include "wcte12xp.h"
-- 
cgit v1.2.3