3 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 60ef166393db..fe5eaf15ece0 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -223,6 +223,8 @@ CONFIG_BCM4329_CSCAN_ENABLE=y
 CONFIG_BCMDHD=m
 CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
 CONFIG_BCMDHD_HW_OOB=y
+CONFIG_BCMDHD_CSCAN_ENABLE=y
+CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
 CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 CONFIG_WL12XX_SDIO=m
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 5eabb5f1cd7d..b673e736c989 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -166,6 +166,7 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
+CONFIG_CFG80211=m
 CONFIG_BT=y
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
@@ -225,6 +226,11 @@ CONFIG_BCM4329_FIRST_SCAN=y
 CONFIG_BCM4329_FW_PATH="/lib/firmware/bcm4329/fw_bcm4329.bin"
 CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/bcm4329/nvram.txt"
 CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
+CONFIG_BCMDHD=m
+CONFIG_BCMDHD_FW_DIR="/lib/firmware/"
+CONFIG_BCMDHD_NVRAM_DIR="/lib/firmware/"
+CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
+CONFIG_BCMDHD_HW_OOB=y
 CONFIG_USB_CATC=y
 CONFIG_USB_KAWETH=y
 CONFIG_USB_PEGASUS=y
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig
index 4a3cb533d29f..ea42707fa30f 100644
--- a/arch/arm/configs/tegra_android_defconfig
+++ b/arch/arm/configs/tegra_android_defconfig
@@ -209,6 +209,8 @@ CONFIG_BCM4329_CSCAN_ENABLE=y
 CONFIG_BCMDHD=y
 CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
 CONFIG_BCMDHD_HW_OOB=y
+CONFIG_BCMDHD_CSCAN_ENABLE=y
+CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
 CONFIG_USB_USBNET=y
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_BELKIN is not set