--- linux-2.6.30.4-orig/Makefile	2009-08-17 20:00:55.451822000 -0700
+++ linux-2.6.30.4-new/Makefile	2009-08-19 13:53:06.480415000 -0700
@@ -479,6 +479,7 @@
 net-y		:= net/
 libs-y		:= lib/
 core-y		:= usr/
+ooma-y		:= ../../../ooma/
 endif # KBUILD_EXTMOD
 
 ifeq ($(dot-config),1)
@@ -651,12 +652,12 @@
 
 vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-		     $(net-y) $(net-m) $(libs-y) $(libs-m)))
+		     $(net-y) $(net-m) $(ooma-y) $(libs-y) $(libs-m)))
 
 vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
 		     $(init-n) $(init-) \
 		     $(core-n) $(core-) $(drivers-n) $(drivers-) \
-		     $(net-n)  $(net-)  $(libs-n)    $(libs-))))
+		     $(net-n)  $(net-)  $(ooma-y) $(libs-n)    $(libs-))))
 
 init-y		:= $(patsubst %/, %/built-in.o, $(init-y))
 core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
@@ -664,6 +665,7 @@
 net-y		:= $(patsubst %/, %/built-in.o, $(net-y))
 libs-y1		:= $(patsubst %/, %/lib.a, $(libs-y))
 libs-y2		:= $(patsubst %/, %/built-in.o, $(libs-y))
+ooma-y		:= $(patsubst %/, %/built-in.o, $(ooma-y))
 libs-y		:= $(libs-y1) $(libs-y2)
 
 # Build vmlinux
@@ -694,7 +696,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)
+vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(ooma-y)
 vmlinux-all  := $(vmlinux-init) $(vmlinux-main)
 vmlinux-lds  := arch/$(SRCARCH)/kernel/vmlinux.lds
 export KBUILD_VMLINUX_OBJS := $(vmlinux-all)
