summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin Bindal <nbindal@nvidia.com>2013-05-17 15:20:31 +0530
committerMandar Padmawar <mpadmawar@nvidia.com>2013-05-21 03:01:31 -0700
commit430b2d32b849977f268528ee58ee6b9f917cf449 (patch)
tree9b2fd31b88329c08ea00a18ee067599eb8d62db1
parent6199f5728d20ce8ff1f479c3c2c757fb8bf03166 (diff)
arch: arm: tegra11: Disable wifi prepower
Wifi prepower logic is needed to support multiple wifi chip vendors so that we can load different wifi driver at run-time. Disable this flag for rel_roth as it uses only bcm43241 wifi chip. Bug 1280309 Change-Id: Ia1399c3fe003c6704a868f7646c011d0899e8ddf Signed-off-by: Nitin Bindal <nbindal@nvidia.com> Reviewed-on: http://git-master/r/230826 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Rakesh Kumar <krakesh@nvidia.com> Reviewed-by: Matt Wagner <mwagner@nvidia.com>
-rw-r--r--arch/arm/configs/tegra11_android_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra11_android_defconfig b/arch/arm/configs/tegra11_android_defconfig
index 2382d6a47276..248fa6463b7f 100644
--- a/arch/arm/configs/tegra11_android_defconfig
+++ b/arch/arm/configs/tegra11_android_defconfig
@@ -40,7 +40,6 @@ CONFIG_TEGRA_WAKEUP_MONITOR=y
CONFIG_TEGRA_USB_MODEM_POWER=y
CONFIG_TEGRA_BB_XMM_POWER=y
CONFIG_TEGRA_BB_XMM_POWER2=m
-CONFIG_TEGRA_PREPOWER_WIFI=y
CONFIG_TEGRA_SKIN_THROTTLE=y
CONFIG_TEGRA_PLLM_SCALED=y
# CONFIG_CACHE_L2X0 is not set
@@ -243,9 +242,9 @@ CONFIG_BCMDHD=m
CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/bcm43241/fw_bcmdhd.bin"
CONFIG_BCMDHD_NVRAM_PATH="/system/etc/nvram_43241.txt"
CONFIG_BCMDHD_CFG80211=y
-CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
CONFIG_BCMDHD_HW_OOB=y
CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
+CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y