--- linux-2.6.19.2/Makefile.orig	2010-10-28 18:13:15.097167459 +0200
+++ linux-2.6.19.2/Makefile	2010-10-28 18:13:18.999117461 +0200
@@ -145,14 +145,8 @@
 
 srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
 TOPDIR		:= $(srctree)
-FUSIV_TOPDIR    := fusiv_src
 
 HPATH           = $(TOPDIR)/include
-FUSIV_APCODEPATH       = $(TOPDIR)/fusiv_src/kernel/ap_code
-FUSIV_APINCPATH        = $(TOPDIR)/fusiv_src/kernel/ap_code/inc
-FUSIV_DRIVERS_INCPATH  = $(TOPDIR)/fusiv_src/kernel/drivers/inc
-FUSIV_ATM_INCPATH      = $(TOPDIR)/fusiv_src/kernel/drivers/adsl
-FUSIV_DRIVERS_VOICE    = $(TOPDIR)/fusiv_src/kernel/drivers/voice/ipvoice
 # FIXME - TOPDIR is obsolete, use srctree/objtree
 objtree		:= $(CURDIR)
 src		:= $(srctree)
@@ -328,7 +322,7 @@
 		   -include include/linux/autoconf.h
 
 ifeq ($(TARGET_CPU),ikanos)
-CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE) -I$(FUSIV_DRIVERS_VOICE)/include -I$(FUSIV_APCODEPATH) -I$(FUSIV_APINCPATH) -I$(FUSIV_DRIVERS_INCPATH) -I$(FUSIV_ATM_INCPATH)
+CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 else
 CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 endif
@@ -461,7 +455,6 @@
 net-y		:= net/
 libs-y		:= lib/
 core-y		:= usr/
-fusiv_src-y     := fusiv_src/
 endif # KBUILD_EXTMOD
 
 ifeq ($(dot-config),1)
@@ -609,18 +602,17 @@
 
 vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-		     $(net-y) $(fusiv_src-y) $(net-m) $(libs-y) $(libs-m)))
+		     $(net-y) $(net-m) $(libs-y) $(libs-m)))
 
 vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
 		     $(init-n) $(init-) \
 		     $(core-n) $(core-) $(drivers-n) $(drivers-) \
-		     $(net-n)  $(net-)  $(fusiv_src-y) $(libs-n)    $(libs-))))
+		     $(net-n)  $(net-) $(libs-n)    $(libs-))))
 
 init-y		:= $(patsubst %/, %/built-in.o, $(init-y))
 core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
 drivers-y	:= $(patsubst %/, %/built-in.o, $(drivers-y))
 net-y		:= $(patsubst %/, %/built-in.o, $(net-y))
-fusiv_src-y     := $(patsubst %/, %/built-in.o, $(fusiv_src-y))
 libs-y1		:= $(patsubst %/, %/lib.a, $(libs-y))
 libs-y2		:= $(patsubst %/, %/built-in.o, $(libs-y))
 libs-y		:= $(libs-y1) $(libs-y2)
@@ -653,7 +645,7 @@
 # System.map is generated to document addresses of all kernel symbols
 
 vmlinux-init := $(head-y) $(init-y)
-vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(fusiv_src-y)
+vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y)
 vmlinux-all  := $(vmlinux-init) $(vmlinux-main)
 vmlinux-lds  := arch/$(ARCH)/kernel/vmlinux.lds