commit a87e660adbd99084c9c2d90c99c92af94e25bfcb
author Jeff Johnson <jjohnson@codeaurora.org> Thu Oct 13 08:04:04 2011 -0700
committer Jeff Johnson <jjohnson@codeaurora.org> Sat Oct 15 08:11:24 2011 -0700
tree a61da92bf8d23a6af8c87ea71600315ebe9069cc
parent b46f4157ba20f9d66c0cf9cf6d8e456a4934a9c3

msm8960: Configuration changes required by WLAN

Enable CONFIG_CFG80211 as it is required by the latest version of the
wpa_supplicant which will be utilized by the WLAN driver for Wi-Fi
Direct support.  Disable CONFIG_CFG80211_WEXT since we do not need
that support (it is enabled by default when CONFIG_CFG80211 is
enabled).  Enable CONFIG_RFKILL_PM.

Change-Id: I03a68e34b8868b3a378ea489778baf2ba3ee13ba
Signed-off-by: Jeff Johnson <jjohnson@codeaurora.org>

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index ddbe87c..7564020 100755
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -192,6 +192,7 @@
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCISMD=m
 CONFIG_RFKILL=y
+CONFIG_RFKILL_PM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_MISC_DEVICES=y
@@ -219,6 +220,8 @@
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WCNSS_CORE=m
+CONFIG_CFG80211=y
+CONFIG_CFG80211_WEXT=n
 CONFIG_SLIP=y
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_MODE_SLIP6=y