summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2015-03-30 16:40:15 +0200
committerOlof Johansson <olof@lixom.net>2015-04-03 13:53:13 -0700
commit3021af88d5fb59ee9ec4319b08f69be69c4cd124 (patch)
treea052e65b99a3bec3a1b9d120c79a356902e2c007 /arch/arm/configs
parent049b94d614a0bd60602d433fe68a7e8a02e11f46 (diff)
downloadlinux-stable-3021af88d5fb59ee9ec4319b08f69be69c4cd124.tar.gz
linux-stable-3021af88d5fb59ee9ec4319b08f69be69c4cd124.tar.bz2
linux-stable-3021af88d5fb59ee9ec4319b08f69be69c4cd124.zip
ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
Needed in several Chromebook models such as the Tegra-based ones. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e81b032288c9..122655e28b5a 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -134,6 +134,9 @@ CONFIG_CAN_BCM=y
CONFIG_CAN_DEV=y
CONFIG_CAN_XILINXCAN=y
CONFIG_CAN_MCP251X=y
+CONFIG_BT=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
CONFIG_CFG80211=m
CONFIG_MAC80211=m
CONFIG_RFKILL=y
@@ -201,6 +204,8 @@ CONFIG_USB_NET_SMSC95XX=y
CONFIG_BRCMFMAC=m
CONFIG_RT2X00=m
CONFIG_RT2800USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y