4 files changed, 6 insertions, 36 deletions
diff --git a/drivers/dahdi/wct4xxp/Kbuild b/drivers/dahdi/wct4xxp/Kbuild
index 96909f4..ca8d0d7 100644
--- a/drivers/dahdi/wct4xxp/Kbuild
+++ b/drivers/dahdi/wct4xxp/Kbuild
@@ -19,9 +19,3 @@ $(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-064.o: $(obj)/base.o
 
 $(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-128.o: $(obj)/base.o
 	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-128.o
-
-$(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
-$(obj)/base.o: $(src)/../zaptel.h
-
-$(obj)/vpm450m.o: $(src)/vpm450m.h
-$(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
diff --git a/drivers/dahdi/wct4xxp/Makefile b/drivers/dahdi/wct4xxp/Makefile
index 4f0961e..5406e07 100644
--- a/drivers/dahdi/wct4xxp/Makefile
+++ b/drivers/dahdi/wct4xxp/Makefile
@@ -5,32 +5,4 @@ ifneq ($(KBUILD_EXTMOD),)
 include $(src)/Kbuild
 
 else
-
-FIRM_DIR	:= ../../firmware
-
-OCTASIC_OBJS:=$(shell ../oct612x/octasic-helper objects ../oct612x)
-OCTASIC_CFLAGS:=$(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef
-
-all: wct4xxp.o
-
-%.o: %.c
-	$(CC) $(KFLAGS) $(OCTASIC_CFLAGS) -o $@ -c $<
-
-base.o: ../zaptel.h vpm450m.h wct4xxp.h
-
-vpm450m.o: vpm450m.h ../oct612x/include/oct6100api/oct6100_api.h
-
-$(FIRM_DIR)/zaptel-fw-oct6114-064.o: base.o
-	$(MAKE) -C $(FIRM_DIR) zaptel-fw-oct6114-064.o
-
-$(FIRM_DIR)/zaptel-fw-oct6114-128.o: base.o
-	$(MAKE) -C $(FIRM_DIR) zaptel-fw-oct6114-128.o
-
-wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) $(FIRM_DIR)/zaptel-fw-oct6114-064.o $(FIRM_DIR)/zaptel-fw-oct6114-128.o
-	$(LD) -r -o $@ $^
-
-clean:
-	rm -f *.o
-	rm -f $(OCTASIC_OBJS)
-
 endif
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index 28a8ecc..26b08a9 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -37,7 +37,10 @@
 #include <asm/io.h>
 #include <linux/version.h>
 #include <linux/delay.h>
-#include "zaptel.h"
+
+#include <dahdi/kernel.h>
+#include <dahdi/user.h>
+
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
diff --git a/drivers/dahdi/wct4xxp/wct4xxp-diag.c b/drivers/dahdi/wct4xxp/wct4xxp-diag.c
index 8c14611..3616f17 100644
--- a/drivers/dahdi/wct4xxp/wct4xxp-diag.c
+++ b/drivers/dahdi/wct4xxp/wct4xxp-diag.c
@@ -5,7 +5,8 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <string.h>
-#include "zaptel.h"
+#include <dahdi/kernel.h>
+#include <dahdi/user.h>
 #include "wct4xxp.h"
 
 static struct t4_reg_def {