diff -Nru -X /usr/src/linux/Documentation/dontdiff -x '*.verified' -x '*_modes' -x '*.h' -x '*_shipped' -x makefw dahdi-linux-2.6.0.o/drivers/dahdi/Kbuild dahdi-linux-2.6.0/drivers/dahdi/Kbuild
--- dahdi-linux-2.6.0.o/drivers/dahdi/Kbuild	2012-02-29 00:37:35.000000000 +0200
+++ dahdi-linux-2.6.0/drivers/dahdi/Kbuild	2012-02-29 00:40:37.000000000 +0200
@@ -41,6 +41,12 @@
 
 obj-m += $(DAHDI_MODULES_EXTRA)
 
+obj-m += oct612x.o
+
+oct612x-objs := $(shell $(src)/oct612x/octasic-helper objects oct612x) oct612x-symbols.o
+oct612x-objs += oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o
+ccflags-y += $(shell $(src)/oct612x/octasic-helper cflags $(src)/oct612x) -Wno-undef
+
 # Only enable this if you think you know what you're doing. This is not
 # supported yet:
 #obj-m += dahdi_echocan_oslec.o
diff -Nru -X /usr/src/linux/Documentation/dontdiff -x '*.verified' -x '*_modes' -x '*.h' -x '*_shipped' -x makefw dahdi-linux-2.6.0.o/drivers/dahdi/oct612x-symbols.c dahdi-linux-2.6.0/drivers/dahdi/oct612x-symbols.c
--- dahdi-linux-2.6.0.o/drivers/dahdi/oct612x-symbols.c	1970-01-01 02:00:00.000000000 +0200
+++ dahdi-linux-2.6.0/drivers/dahdi/oct612x-symbols.c	2012-02-29 00:38:51.000000000 +0200
@@ -0,0 +1,28 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include "oct6100api/oct6100_api.h"
+
+MODULE_LICENSE("GPLv2");
+MODULE_AUTHOR("Jaco Kroon and Stefan Knoblich");
+MODULE_DESCRIPTION("Octasic 612x echo canceller library");
+MODULE_VERSION("0.0.1");
+
+EXPORT_SYMBOL_GPL(Oct6100ApiGetCapacityPins);
+EXPORT_SYMBOL_GPL(Oct6100ApiGetCapacityPinsDef);
+EXPORT_SYMBOL_GPL(Oct6100ChannelModify);
+EXPORT_SYMBOL_GPL(Oct6100ChannelModifyDef);
+EXPORT_SYMBOL_GPL(Oct6100ChannelOpen);
+EXPORT_SYMBOL_GPL(Oct6100ChannelOpenDef);
+EXPORT_SYMBOL_GPL(Oct6100ChipClose);
+EXPORT_SYMBOL_GPL(Oct6100ChipCloseDef);
+EXPORT_SYMBOL_GPL(Oct6100ChipOpen);
+EXPORT_SYMBOL_GPL(Oct6100ChipOpenDef);
+EXPORT_SYMBOL_GPL(Oct6100EventGetTone);
+EXPORT_SYMBOL_GPL(Oct6100EventGetToneDef);
+EXPORT_SYMBOL_GPL(Oct6100GetInstanceSize);
+EXPORT_SYMBOL_GPL(Oct6100GetInstanceSizeDef);
+EXPORT_SYMBOL_GPL(Oct6100InterruptServiceRoutine);
+EXPORT_SYMBOL_GPL(Oct6100InterruptServiceRoutineDef);
+EXPORT_SYMBOL_GPL(Oct6100ToneDetectionEnable);
+EXPORT_SYMBOL_GPL(Oct6100ToneDetectionEnableDef);
diff -Nru -X /usr/src/linux/Documentation/dontdiff -x '*.verified' -x '*_modes' -x '*.h' -x '*_shipped' -x makefw dahdi-linux-2.6.0.o/drivers/dahdi/opvxd115/Kbuild dahdi-linux-2.6.0/drivers/dahdi/opvxd115/Kbuild
--- dahdi-linux-2.6.0.o/drivers/dahdi/opvxd115/Kbuild	2012-02-29 00:37:35.000000000 +0200
+++ dahdi-linux-2.6.0/drivers/dahdi/opvxd115/Kbuild	2012-02-29 00:38:51.000000000 +0200
@@ -8,7 +8,7 @@
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
 endif
 
-opvxd115-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
+opvxd115-objs := base.o vpm450m.o
 
 DAHDI_KERNEL_H_NAME:=kernel.h
 DAHDI_KERNEL_H_PATH:=$(DAHDI_INCLUDE)/dahdi/$(DAHDI_KERNEL_H_NAME)
diff -Nru -X /usr/src/linux/Documentation/dontdiff -x '*.verified' -x '*_modes' -x '*.h' -x '*_shipped' -x makefw dahdi-linux-2.6.0.o/drivers/dahdi/wct4xxp/Kbuild dahdi-linux-2.6.0/drivers/dahdi/wct4xxp/Kbuild
--- dahdi-linux-2.6.0.o/drivers/dahdi/wct4xxp/Kbuild	2011-11-01 17:27:21.000000000 +0200
+++ dahdi-linux-2.6.0/drivers/dahdi/wct4xxp/Kbuild	2012-02-29 00:38:51.000000000 +0200
@@ -14,7 +14,7 @@
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
 endif
 
-wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
+wct4xxp-objs := base.o vpm450m.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
 wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o