From 7d0776308320c0c2606e982c01f37363e71172f6 Mon Sep 17 00:00:00 2001
From: Wu Gao <wugao@codeaurora.org>
Date: Mon, 27 Apr 2020 18:02:50 +0800
Subject: [PATCH] qcacld-3.0: Remove CFG_CFR_ALL

Remove CFG_CFR_ALL from CFG_ALL and avoid duplicate definition, since
WIN needs it and add it to CFG_CONVERGED_ALL by another change.

Change-Id: I4fe82573d069a06bf130937a3e38d045bb80c695
CRs-Fixed: 2673162
---
 components/cfg/cfg_all.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/components/cfg/cfg_all.h b/components/cfg/cfg_all.h
index 6f0d1b3976..c0c30c600b 100644
--- a/components/cfg/cfg_all.h
+++ b/components/cfg/cfg_all.h
@@ -41,12 +41,6 @@
 #define CFG_NAN_ALL
 #endif
 
-#ifdef WLAN_CFR_ENABLE
-#include "cfr_cfg.h"
-#else
-#define CFG_CFR_ALL
-#endif
-
 #include "cfg_ftm_time_sync.h"
 
 #include "wlan_pmo_cfg.h"
@@ -72,5 +66,4 @@
 	CFG_PMO_ALL \
 	CFG_TDLS_ALL \
 	CFG_PKT_CAPTURE_MODE_ALL \
-	CFG_TIME_SYNC_FTM_ALL \
-	CFG_CFR_ALL
+	CFG_TIME_SYNC_FTM_ALL