From dd0b061ad740260cbe62edff4aeec2e42db3fdf9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 21 Dec 2012 15:49:18 +0100
Subject: [PATCH] --- yaml --- r: 359905 b: refs/heads/master c:
 0c8cb1d4ae7d1a96be6a0bef18e7f44d88a18fdf h: refs/heads/master i:   359903:
 531a42d0dc7b5c425aff0f2e1052a3be1b27ff46 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/configs/mvebu_defconfig | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 32f18540f481..6448caaabbd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e2a396234d5b044c50145ec9d05648a618c0d1
+refs/heads/master: 0c8cb1d4ae7d1a96be6a0bef18e7f44d88a18fdf
diff --git a/trunk/arch/arm/configs/mvebu_defconfig b/trunk/arch/arm/configs/mvebu_defconfig
index f69a7159f787..6243175e845a 100644
--- a/trunk/arch/arm/configs/mvebu_defconfig
+++ b/trunk/arch/arm/configs/mvebu_defconfig
@@ -24,6 +24,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_VFP=y
 CONFIG_NET=y
 CONFIG_INET=y
+CONFIG_CFG80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
@@ -31,6 +32,8 @@ CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_MVNETA=y
 CONFIG_MARVELL_PHY=y
+CONFIG_MWIFIEX=y
+CONFIG_MWIFIEX_SDIO=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_I2C=y