From d471d31897b9bae524857ab7842cd3c9175743a8 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Tue, 29 Mar 2011 17:56:19 -0700
Subject: [PATCH] --- yaml --- r: 249007 b: refs/heads/master c:
 524717f1a4624dcee164a69722bb1506d97c5d80 h: refs/heads/master i:   249005:
 db92a7c1c4a7609314dba271dad86e177ff597b2   249003:
 e6b126aac8dc94e6f3d1601e6a0c67b84664db91   248999:
 cf10b73313ddfadd051f1c4539f81ecf1cc5a607   248991:
 e1a9ddfa467fd6d7455543f1981c29647fcc51b4 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/ath6kl/Makefile              | 4 ----
 trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c | 8 ++++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ab2f88c3d7a9..560f0eeb7164 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b1978ee0053667956ef9d65e5b48d2f1f14bc05
+refs/heads/master: 524717f1a4624dcee164a69722bb1506d97c5d80
diff --git a/trunk/drivers/staging/ath6kl/Makefile b/trunk/drivers/staging/ath6kl/Makefile
index b0f711ea5dd2..1d3f2390a172 100644
--- a/trunk/drivers/staging/ath6kl/Makefile
+++ b/trunk/drivers/staging/ath6kl/Makefile
@@ -29,10 +29,6 @@ ccflags-y += -I$(obj)/os
 ccflags-y += -I$(obj)/bmi/include
 ccflags-y += -I$(obj)/include/common/AR6002/hw4.0
 
-ifeq ($(CONFIG_ATH6KL_ENABLE_COEXISTENCE),y)
-ccflags-y += -DENABLE_COEXISTENCE
-endif
-
 ifeq ($(CONFIG_AR600x_DUAL_ANTENNA),y)
 ccflags-y += -DAR600x_DUAL_ANTENNA
 endif
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 8f9e4b2797b8..1798889657d3 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -2334,10 +2334,10 @@ u8 ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep )
 int ar6000_target_config_wlan_params(struct ar6_softc *ar)
 {
     int status = 0;
-#if defined(ENABLE_COEXISTENCE)
+#if defined(CONFIG_ATH6KL_ENABLE_COEXISTENCE)
     WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD sbcb_cmd;
     WMI_SET_BTCOEX_FE_ANT_CMD sbfa_cmd;
-#endif /* ENABLE_COEXISTENCE */
+#endif /* CONFIG_ATH6KL_ENABLE_COEXISTENCE */
 
 #ifdef CONFIG_HOST_TCMD_SUPPORT
     if (ar->arTargetMode != AR6000_WLAN_MODE) {
@@ -2355,7 +2355,7 @@ int ar6000_target_config_wlan_params(struct ar6_softc *ar)
         status = A_ERROR;
     }
 
-#if defined(ENABLE_COEXISTENCE)
+#if defined(CONFIG_ATH6KL_ENABLE_COEXISTENCE)
     /* Configure the type of BT collocated with WLAN */
     memset(&sbcb_cmd, 0, sizeof(WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD));
 #ifdef CONFIG_AR600x_BT_QCOM
@@ -2387,7 +2387,7 @@ int ar6000_target_config_wlan_params(struct ar6_softc *ar)
         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Unable to set fornt end antenna configuration\n"));
         status = A_ERROR;
     }
-#endif /* ENABLE_COEXISTENCE */
+#endif /* CONFIG_ATH6KL_ENABLE_COEXISTENCE */
 
 #if WLAN_CONFIG_IGNORE_POWER_SAVE_FAIL_EVENT_DURING_SCAN
     if ((wmi_pmparams_cmd(ar->arWmi, 0, 1, 0, 0, 1, IGNORE_POWER_SAVE_FAIL_EVENT_DURING_SCAN)) != 0) {