commit 0ef2bc5c6eb74c6e48f52064c64c2ebfa7ff2e89
author Linux Build Service Account <lnxbuild@localhost> Sun May 27 16:14:03 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sun May 27 16:14:03 2012 -0700
tree a017f199baed57277eb6d9894ddf279df030e70f
parent d1524d6079f7100771519c63e1c6a0c7d0a70fcc
parent 8290964ecfc59e67937e806a82846c8ab59a99b6

Merge "defconfig: Add changes to build cfg80211 as module" into msm-3.0

arch/arm/configs/msm8960-perf_defconfig

diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig
index 255d92a..c93598d 100644
--- a/arch/arm/configs/msm8960-perf_defconfig
+++ b/arch/arm/configs/msm8960-perf_defconfig
@@ -227,7 +227,7 @@
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCISMD=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
 # CONFIG_CFG80211_WEXT is not set
 CONFIG_RFKILL=y
 CONFIG_GENLOCK=y

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 62b1a57..06211d5 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -234,7 +234,7 @@
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCISMD=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
 # CONFIG_CFG80211_WEXT is not set
 CONFIG_RFKILL=y
 CONFIG_GENLOCK=y