From b34f3053439d4bc174e2d1a1b23af7fa84fcd332 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 21 Dec 2012 15:49:19 +0100
Subject: [PATCH] --- yaml --- r: 359906 b: refs/heads/master c:
 c9b7a72d988d3474f3127cd39084d18bcc2df3df h: refs/heads/master 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 6448caaabbd1..6c6560beb2d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c8cb1d4ae7d1a96be6a0bef18e7f44d88a18fdf
+refs/heads/master: c9b7a72d988d3474f3127cd39084d18bcc2df3df
diff --git a/trunk/arch/arm/configs/mvebu_defconfig b/trunk/arch/arm/configs/mvebu_defconfig
index 6243175e845a..02adb5dfb773 100644
--- a/trunk/arch/arm/configs/mvebu_defconfig
+++ b/trunk/arch/arm/configs/mvebu_defconfig
@@ -24,6 +24,9 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_VFP=y
 CONFIG_NET=y
 CONFIG_INET=y
+CONFIG_BT=y
+CONFIG_BT_MRVL=y
+CONFIG_BT_MRVL_SDIO=y
 CONFIG_CFG80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_SD=y