commit e279fe8fa14a44fc83dd2007c9b56ac923e42c13
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 24 02:24:21 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Mar 24 02:24:21 2013 -0700
tree ea843eb757032e000a786c75251bbf22dd4b5e3f
parent 66bfa072458a58acbee95a19b2aaebbe037a6faa
parent d2b3074af0a4b88b6982bd292d3cf315366e31dc

Merge "defconfig: msm8974: Enable atheros bluetooth driver"

arch/arm/configs/msm8974-perf_defconfig

diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
index 2f5f7f0..d2c97b1 100644
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -226,6 +226,8 @@
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCISMD=y
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_MSM_BT_POWER=y
 CONFIG_CFG80211=y
 CONFIG_NL80211_TESTMODE=y

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index 4aebfdb..c9d6112 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -230,6 +230,8 @@
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCISMD=y
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_MSM_BT_POWER=y
 CONFIG_CFG80211=y
 CONFIG_NL80211_TESTMODE=y