diff --git a/arch/arm/configs/sparrow_user_msm8226-perf_defconfig b/arch/arm/configs/sparrow_user_msm8226-perf_defconfig
index ed117c5c02f606bd5b565ebb73b0fa379a3bb1b0..ef35d1623cfff5de8d692959b521be81b6b5ae21 100644
--- a/arch/arm/configs/sparrow_user_msm8226-perf_defconfig
+++ b/arch/arm/configs/sparrow_user_msm8226-perf_defconfig
@@ -190,7 +190,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y
 CONFIG_NFC_QNCI=y
 CONFIG_IPC_ROUTER=y
 CONFIG_IPC_ROUTER_SECURITY=y
-CONFIG_BCMDHD=m
+CONFIG_BCMDHD=y
 CONFIG_BCMDHD_SDIO=y
 CONFIG_DHD_USE_SCHED_SCAN=y
 CONFIG_CMA=y
diff --git a/arch/arm/configs/sparrow_userdebug_msm8226_defconfig b/arch/arm/configs/sparrow_userdebug_msm8226_defconfig
index ffd6c53005bd0b7fcfbfde68d9b9069847d78255..24f0af25f1ecb971c89285ae926d96ca2959d4d8 100644
--- a/arch/arm/configs/sparrow_userdebug_msm8226_defconfig
+++ b/arch/arm/configs/sparrow_userdebug_msm8226_defconfig
@@ -189,7 +189,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y
 CONFIG_NFC_QNCI=y
 CONFIG_IPC_ROUTER=y
 CONFIG_IPC_ROUTER_SECURITY=y
-CONFIG_BCMDHD=m
+CONFIG_BCMDHD=y
 CONFIG_BCMDHD_SDIO=y
 CONFIG_DHD_USE_SCHED_SCAN=y
 CONFIG_CMA=y
diff --git a/arch/arm/configs/wren_user_msm8226-perf_defconfig b/arch/arm/configs/wren_user_msm8226-perf_defconfig
index f23c4c27355b6e8f50daf16169749e28cb47b9eb..48e2cd62a750d29acdedfdeb1cddf005a287aaaf 100644
--- a/arch/arm/configs/wren_user_msm8226-perf_defconfig
+++ b/arch/arm/configs/wren_user_msm8226-perf_defconfig
@@ -190,7 +190,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y
 CONFIG_NFC_QNCI=y
 CONFIG_IPC_ROUTER=y
 CONFIG_IPC_ROUTER_SECURITY=y
-CONFIG_BCMDHD=m
+CONFIG_BCMDHD=y
 CONFIG_BCMDHD_SDIO=y
 CONFIG_DHD_USE_SCHED_SCAN=y
 CONFIG_CMA=y
diff --git a/arch/arm/configs/wren_userdebug_msm8226_defconfig b/arch/arm/configs/wren_userdebug_msm8226_defconfig
index 32fb5111ca73202737a1392b950343b61f4d2ffa..b3042c54d2cc82b0e33d1ef51fc2455cbd989ec1 100644
--- a/arch/arm/configs/wren_userdebug_msm8226_defconfig
+++ b/arch/arm/configs/wren_userdebug_msm8226_defconfig
@@ -189,7 +189,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y
 CONFIG_NFC_QNCI=y
 CONFIG_IPC_ROUTER=y
 CONFIG_IPC_ROUTER_SECURITY=y
-CONFIG_BCMDHD=m
+CONFIG_BCMDHD=y
 CONFIG_BCMDHD_SDIO=y
 CONFIG_DHD_USE_SCHED_SCAN=y
 CONFIG_CMA=y
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 39ec55ced87874bfa2cfc4f27827467dc3987475..ec56b05a1accfcb44680b89fb565336e748e05ee 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -370,5 +370,6 @@ source "drivers/net/wireless/rtlwifi/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/mwifiex/Kconfig"
+source "drivers/net/wireless/bcmdhd/Kconfig"
 
 endif # WLAN
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index f2d9d0f1a05838848cf37cc8363c75219544570a..fa9680b63ad41b372b71f4ae82b213f809cbf95d 100755
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -63,5 +63,5 @@ obj-$(CONFIG_WCNSS_CORE)	+= wcnss/
 obj-$(CONFIG_CNSS)		+= cnss/
 
 # ASUS_BSP+++ Add bcm4343w wlan driver
-obj-m += bcmdhd/
+obj-$(CONFIG_BCMDHD) += bcmdhd/
 # ASUS_BSP--- Add bcm4343w wlan driver