From: Tomeu Vizoso Date: Mon, 30 Mar 2015 14:40:15 +0000 (+0200) Subject: ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module X-Git-Tag: v4.1-rc1~47^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3021af88d5fb59ee9ec4319b08f69be69c4cd124;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Olof Johansson --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e81b032288c97..122655e28b5a3 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