CHROMIUM: Config: Enable ath9k_btcoex in intel builds

BUG=chrome-os-partner:11082
TEST=Boot device, join WiFi (minimal Bluetooth testing done)
CQ-DEPENDS=28420
Signed-off-by: Paul Stewart <pstew@chromium.org>
Change-Id: I4259f8953c4ee7ac543c150fd3922f6371071fdb
Reviewed-on: https://gerrit.chromium.org/gerrit/28848

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index ed23321..981e15b 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -92,12 +92,15 @@ CONFIG_ATH5K_PCI=y
 # CONFIG_ATH5K_TRACER is not set
 # CONFIG_ATH6KL is not set
 CONFIG_ATH9K=m
+CONFIG_ATH9K_BTCOEX=m
 # CONFIG_ATH9K_AHB is not set
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_COMMON=m
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DFS_CERTIFIED is not set
 CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_BTCOEX_HW=m
 CONFIG_ATH9K_MAC_DEBUG=y
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_RATE_CONTROL=y

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 0f22d91..8ef55cf 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -98,12 +98,15 @@ CONFIG_ATH5K_PCI=y
 # CONFIG_ATH5K_TRACER is not set
 # CONFIG_ATH6KL is not set
 CONFIG_ATH9K=m
+CONFIG_ATH9K_BTCOEX=m
 # CONFIG_ATH9K_AHB is not set
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_COMMON=m
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DFS_CERTIFIED is not set
 CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_BTCOEX_HW=m
 CONFIG_ATH9K_MAC_DEBUG=y
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_RATE_CONTROL=y