diff --git a/drivers/moto_f_usbnet/Kbuild b/drivers/moto_f_usbnet/Kbuild
index 2d2cda8e69ec..331c29b3cfa2 100644
--- a/drivers/moto_f_usbnet/Kbuild
+++ b/drivers/moto_f_usbnet/Kbuild
@@ -1,6 +1,6 @@
 # add -Wall to try to catch everything we can.
 EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
+EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
 
 moto_f_usbnet-objs += f_usbnet.o
-obj-m += moto_f_usbnet.o
\ No newline at end of file
+obj-m += moto_f_usbnet.o
diff --git a/drivers/moto_f_usbnet/Makefile b/drivers/moto_f_usbnet/Makefile
index 34b09dd815a7..4916d32b6d02 100644
--- a/drivers/moto_f_usbnet/Makefile
+++ b/drivers/moto_f_usbnet/Makefile
@@ -1,10 +1,17 @@
-KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
+all: modules
 
-all:
-	$(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS)
+modules:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
 
 modules_install:
-	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install
+	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install
+
+%:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS)
 
 clean:
-	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
\ No newline at end of file
+	rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers
+	rm -rf .tmp_versions
+
+KBUILD_EXTRA_SYMBOLS := $(M)/../../mmi_info/Module.symvers
+