diff --git a/arch/arm/configs/htcleo_defconfig b/arch/arm/configs/htcleo_defconfig
index 6ae5ccce..61ce085b 100644
--- a/arch/arm/configs/htcleo_defconfig
+++ b/arch/arm/configs/htcleo_defconfig
@@ -741,7 +741,7 @@ CONFIG_BT_HCIUART_H4=y
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
+# CONFIG_CFG80211 is not set
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
@@ -909,7 +909,7 @@ CONFIG_TUN=m
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN_80211=y
+# CONFIG_WLAN_80211 is not set
 CONFIG_BCM4329=m
 CONFIG_BCM4329_SOFTAP=y
 CONFIG_BCM4329_FW_PATH="/system/etc/firmware/fw_bcm4329.bin"
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index e7cdd843..1cf4d029 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -488,6 +488,6 @@ source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
 source "drivers/net/wireless/iwmc3200wifi/Kconfig"
-source "drivers/net/wireless/bcm4329_245/Kconfig"
+source "drivers/net/wireless/bcm4329_204/Kconfig"
 
 endif # WLAN
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index a5b0e84b..380d6d13 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -63,4 +63,4 @@ obj-$(CONFIG_WL12XX)	+= wl12xx/
 
 obj-$(CONFIG_IWM)	+= iwmc3200wifi/
 
-obj-$(CONFIG_BCM4329)	+= bcm4329_245/
+obj-$(CONFIG_BCM4329)	+= bcm4329_204/
diff --git a/drivers/net/wireless/bcm4329_245/Makefile b/drivers/net/wireless/bcm4329_245/Makefile
index e24855c8..75c08e68 100644
--- a/drivers/net/wireless/bcm4329_245/Makefile
+++ b/drivers/net/wireless/bcm4329_245/Makefile
@@ -5,8 +5,8 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2         \
 	-DSHOW_EVENTS -DBCMSDIO -DDHD_GPL -DBCMLXSDMMC -DBCMPLATFORM_BUS      \
 	-Wall -Wstrict-prototypes -Werror -DOOB_INTR_ONLY -DCUSTOMER_HW2      \
 	-DDHD_USE_STATIC_BUF -DMMC_SDIO_ABORT -DWLAN_PFN -DWLAN_PROTECT       \
-	-DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT        \
-	-DSET_RANDOM_MAC_SOFTAP				                     \
+	-DOEM_ANDROID -DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT \
+	-DBCMDBG -DCUSTOM_OOB_GPIO_NUM=152 -DSOFTAP	\
 	-Idrivers/net/wireless/bcm4329_245 -Idrivers/net/wireless/bcm4329_245/include
 
 DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \