diff --git a/drivers/misc/mediatek/connectivity/bt/linux_v2/Makefile b/drivers/misc/mediatek/connectivity/bt/linux_v2/Makefile
index 298221b67..f2d662b7e 100644
--- a/drivers/misc/mediatek/connectivity/bt/linux_v2/Makefile
+++ b/drivers/misc/mediatek/connectivity/bt/linux_v2/Makefile
@@ -129,7 +129,7 @@ ccflags-y += -Werror
 
 $(MOD_NAME)-objs := $(CFILES:.c=.o)
 
-obj-m += $(MOD_NAME).o
+obj-y += $(MOD_NAME).o
 
 ifneq ($(TARGET_BUILD_VARIANT), user)
 ccflags-y += -DBTMTK_DEBUG_SOP
diff --git a/drivers/misc/mediatek/connectivity/bt/mt66xx/Makefile b/drivers/misc/mediatek/connectivity/bt/mt66xx/Makefile
index 934791142..376794d87 100644
--- a/drivers/misc/mediatek/connectivity/bt/mt66xx/Makefile
+++ b/drivers/misc/mediatek/connectivity/bt/mt66xx/Makefile
@@ -71,7 +71,7 @@ ccflags-y += -I$(src)/include/ -I$(src)/
 
 $(MOD_NAME)-objs := $(CFILES:.c=.o)
 
-obj-m += $(MOD_NAME).o
+obj-y += $(MOD_NAME).o
 
 
 #VPATH = /opt/toolchains/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux
diff --git a/drivers/misc/mediatek/connectivity/connfem/Kbuild b/drivers/misc/mediatek/connectivity/connfem/Kbuild
index 186f46003..33d3dd5e4 100644
--- a/drivers/misc/mediatek/connectivity/connfem/Kbuild
+++ b/drivers/misc/mediatek/connectivity/connfem/Kbuild
@@ -42,7 +42,7 @@ ccflags-y += -I$(KO_CODE_PATH)/include
 # ConnFem Module
 ###############################################################################
 MODULE_NAME := connfem
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 $(MODULE_NAME)-objs += connfem_module.o
 $(MODULE_NAME)-objs += connfem_api.o
diff --git a/drivers/misc/mediatek/connectivity/connfem/Makefile b/drivers/misc/mediatek/connectivity/connfem/Makefile
index 965cb7f79..70ea67c57 100644
--- a/drivers/misc/mediatek/connectivity/connfem/Makefile
+++ b/drivers/misc/mediatek/connectivity/connfem/Makefile
@@ -40,7 +40,7 @@ ccflags-y += -I$(src)/include
 # ConnFem Module
 ###############################################################################
 MODULE_NAME := connfem
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 $(MODULE_NAME)-objs += connfem_module.o
 $(MODULE_NAME)-objs += connfem_api.o
diff --git a/drivers/misc/mediatek/connectivity/fmradio/Makefile b/drivers/misc/mediatek/connectivity/fmradio/Makefile
index 8bac0dd8f..4d2500a1e 100644
--- a/drivers/misc/mediatek/connectivity/fmradio/Makefile
+++ b/drivers/misc/mediatek/connectivity/fmradio/Makefile
@@ -52,7 +52,7 @@ endif
 # Makefile generated by Mediatek
 # fm support
 
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 ifeq ($(CFG_FM_CHIP),)
     FM_CHIP := mt6631_6635
diff --git a/drivers/misc/mediatek/connectivity/gps/Makefile b/drivers/misc/mediatek/connectivity/gps/Makefile
index 7b09f1319..0aef1a37f 100644
--- a/drivers/misc/mediatek/connectivity/gps/Makefile
+++ b/drivers/misc/mediatek/connectivity/gps/Makefile
@@ -66,7 +66,7 @@ ccflags-y += -I$(srctree)/drivers/devfreq
 ###############################################################################
 
 MODULE_NAME := gps_drv
-obj-m += $(MODULE_NAME).o
+obj-o += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := n
 GPS_DL_SUPPORT := n
diff --git a/drivers/misc/mediatek/connectivity/gps/data_link/Makefile b/drivers/misc/mediatek/connectivity/gps/data_link/Makefile
index df6819451..01de685cd 100644
--- a/drivers/misc/mediatek/connectivity/gps/data_link/Makefile
+++ b/drivers/misc/mediatek/connectivity/gps/data_link/Makefile
@@ -57,7 +57,7 @@ KBUILD_MODPOST_FAIL_ON_WARNINGS := y
 ###############################################################################
 
 MODULE_NAME := gps_drv_dl_$(GPS_PLATFORM)
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := n
 GPS_DL_HAS_MOCK := n
diff --git a/drivers/misc/mediatek/connectivity/gps/data_link/plat/v010/Kbuild b/drivers/misc/mediatek/connectivity/gps/data_link/plat/v010/Kbuild
index 061491de9..b275c75dc 100644
--- a/drivers/misc/mediatek/connectivity/gps/data_link/plat/v010/Kbuild
+++ b/drivers/misc/mediatek/connectivity/gps/data_link/plat/v010/Kbuild
@@ -57,7 +57,7 @@ KBUILD_MODPOST_FAIL_ON_WARNINGS := y
 ###############################################################################
 GPS_PLATFORM := v010
 MODULE_NAME := gps_drv_dl_$(GPS_PLATFORM)
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := n
 GPS_DL_HAS_MOCK := n
diff --git a/drivers/misc/mediatek/connectivity/gps/data_link/plat/v030/Kbuild b/drivers/misc/mediatek/connectivity/gps/data_link/plat/v030/Kbuild
index f5e0cdcd1..78e88f48c 100644
--- a/drivers/misc/mediatek/connectivity/gps/data_link/plat/v030/Kbuild
+++ b/drivers/misc/mediatek/connectivity/gps/data_link/plat/v030/Kbuild
@@ -57,7 +57,7 @@ KBUILD_MODPOST_FAIL_ON_WARNINGS := y
 ###############################################################################
 export GPS_PLATFORM := v030
 MODULE_NAME := gps_drv_dl_$(GPS_PLATFORM)
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := n
 GPS_DL_HAS_MOCK := n
diff --git a/drivers/misc/mediatek/connectivity/gps/data_link/plat/v050/Kbuild b/drivers/misc/mediatek/connectivity/gps/data_link/plat/v050/Kbuild
index 89a454eac..e39939f5e 100644
--- a/drivers/misc/mediatek/connectivity/gps/data_link/plat/v050/Kbuild
+++ b/drivers/misc/mediatek/connectivity/gps/data_link/plat/v050/Kbuild
@@ -57,7 +57,7 @@ KBUILD_MODPOST_FAIL_ON_WARNINGS := y
 ###############################################################################
 export GPS_PLATFORM := v050
 MODULE_NAME := gps_drv_dl_$(GPS_PLATFORM)
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := n
 GPS_DL_HAS_MOCK := n
diff --git a/drivers/misc/mediatek/connectivity/gps/gps_pwr/Kbuild b/drivers/misc/mediatek/connectivity/gps/gps_pwr/Kbuild
index 05a0e5714..0a8df0ce6 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps_pwr/Kbuild
+++ b/drivers/misc/mediatek/connectivity/gps/gps_pwr/Kbuild
@@ -33,7 +33,7 @@ ccflags-y += -I$(srctree)/drivers/misc/mediatek/connectivity/power_throttling
 ###############################################################################
 GPS_PWR_TEST_SUPPORT :=n
 MODULE_NAME := gps_pwr
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 $(MODULE_NAME)-objs += gps_pwr.o
 ifeq ($(GPS_PWR_TEST_SUPPORT),y)
diff --git a/drivers/misc/mediatek/connectivity/gps/gps_pwr/Makefile b/drivers/misc/mediatek/connectivity/gps/gps_pwr/Makefile
index 05a0e5714..0a8df0ce6 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps_pwr/Makefile
+++ b/drivers/misc/mediatek/connectivity/gps/gps_pwr/Makefile
@@ -33,7 +33,7 @@ ccflags-y += -I$(srctree)/drivers/misc/mediatek/connectivity/power_throttling
 ###############################################################################
 GPS_PWR_TEST_SUPPORT :=n
 MODULE_NAME := gps_pwr
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 $(MODULE_NAME)-objs += gps_pwr.o
 ifeq ($(GPS_PWR_TEST_SUPPORT),y)
diff --git a/drivers/misc/mediatek/connectivity/gps/gps_scp/Kbuild b/drivers/misc/mediatek/connectivity/gps/gps_scp/Kbuild
index cfaea177c..012cd5099 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps_scp/Kbuild
+++ b/drivers/misc/mediatek/connectivity/gps/gps_scp/Kbuild
@@ -33,7 +33,7 @@ ccflags-y += -I$(srctree)/drivers/misc/mediatek/conn_scp/conap_scp
 ###############################################################################
 GPS2SCP_TEST_SUPPORT :=n
 MODULE_NAME := gps_scp
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 $(MODULE_NAME)-objs += gps2scp.o
 ifeq ($(GPS2SCP_TEST_SUPPORT),y)
diff --git a/drivers/misc/mediatek/connectivity/gps/gps_scp/Makefile b/drivers/misc/mediatek/connectivity/gps/gps_scp/Makefile
index cfaea177c..012cd5099 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps_scp/Makefile
+++ b/drivers/misc/mediatek/connectivity/gps/gps_scp/Makefile
@@ -33,7 +33,7 @@ ccflags-y += -I$(srctree)/drivers/misc/mediatek/conn_scp/conap_scp
 ###############################################################################
 GPS2SCP_TEST_SUPPORT :=n
 MODULE_NAME := gps_scp
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 $(MODULE_NAME)-objs += gps2scp.o
 ifeq ($(GPS2SCP_TEST_SUPPORT),y)
diff --git a/drivers/misc/mediatek/connectivity/gps/gps_stp/Kbuild b/drivers/misc/mediatek/connectivity/gps/gps_stp/Kbuild
index 4c54505af..6d9fdc01b 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps_stp/Kbuild
+++ b/drivers/misc/mediatek/connectivity/gps/gps_stp/Kbuild
@@ -57,7 +57,7 @@ ccflags-y += -I$(srctree)/drivers/misc/mediatek/connectivity/common
 ###############################################################################
 
 MODULE_NAME := gps_drv_stp
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := y
 GPS_SRC_FOLDER := $(srctree)/drivers/misc/mediatek/connectivity/gps/gps_stp
diff --git a/drivers/misc/mediatek/connectivity/gps/gps_stp/Makefile b/drivers/misc/mediatek/connectivity/gps/gps_stp/Makefile
index 95f0b55ce..a7df732d5 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps_stp/Makefile
+++ b/drivers/misc/mediatek/connectivity/gps/gps_stp/Makefile
@@ -61,7 +61,7 @@ ccflags-y += -I$(srctree)/drivers/misc/mediatek/connectivity/common
 ###############################################################################
 
 MODULE_NAME := gps_drv_stp
-obj-m += $(MODULE_NAME).o
+obj-y += $(MODULE_NAME).o
 
 GPS_DRV_CONTROL_LNA := y
 GPS_SRC_FOLDER := $(TOP)/vendor/mediatek/kernel_modules/connectivity/gps/gps_stp