From e3599a90e3eb2bf8f232ce82153a44c12ecf0067 Mon Sep 17 00:00:00 2001
From: Adil Saeed Musthafa <adilm@codeaurora.org>
Date: Mon, 3 Apr 2017 12:40:02 -0700
Subject: [PATCH] qcacmn: Remove all non-QDF directories from include paths

CRs-Fixed: 2026943
Change-Id: I6fa1ba02552b0c1d10c891471e072f9b235e6de8
---
 qdf/Kbuild                                | 20 +-------------------
 utils/logging/src/wlan_logging_sock_svc.c |  4 ++--
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/qdf/Kbuild b/qdf/Kbuild
index cf28b93a5b47..cb09c428df14 100644
--- a/qdf/Kbuild
+++ b/qdf/Kbuild
@@ -26,25 +26,7 @@ INCS += -I$(obj)/$(HOST_CMN_CONVG_PTT)/inc \
         -I$(obj)/$(HOST_CMN_CONVG_LOGGING)/inc \
         -I$(obj)/$(DEPTH)/cmn_dev/utils/host_diag_log/inc \
         -I$(obj)/$(DEPTH)/cmn_dev/utils/host_diag_log/src \
-        -I$(obj)/$(DEPTH)/cmn_dev/utils/ptt/inc \
-        -I$(obj)/$(DEPTH)/hal \
-        -I$(obj)/$(DEPTH)/offload/wlan/txrx/include \
-        -I$(obj)/$(DEPTH)/offload/wlan/ath_pktlog/include \
-        -I$(obj)/$(DEPTH)/offload/wlan/include \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/obj_mgr/inc \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/inc \
-        -I$(obj)/$(DEPTH)/cmn_dev/wmi/inc \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/global_umac_dispatcher/lmac_if/inc \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/mgmt_txrx/dispatcher/inc \
-        -I$(obj)/$(DEPTH)/offload/hw/include \
-        -I$(obj)/$(DEPTH)/umac/base \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/cmn_defs/inc \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/scan/dispatcher/inc \
-        -I$(obj)/$(DEPTH)/hal/linux \
-        -I$(obj)/$(DEPTH)/lmac/ath_dev \
-        -I$(obj)/$(DEPTH)/cmn_dev/umac/regulatory/dispatcher/inc
-
-
+        -I$(obj)/$(DEPTH)/cmn_dev/utils/ptt/inc
 
 obj-m += qdf.o
 
diff --git a/utils/logging/src/wlan_logging_sock_svc.c b/utils/logging/src/wlan_logging_sock_svc.c
index eecb476475d8..d0ad14fdf75a 100644
--- a/utils/logging/src/wlan_logging_sock_svc.c
+++ b/utils/logging/src/wlan_logging_sock_svc.c
@@ -39,6 +39,8 @@
 #include "csr_api.h"
 #include "wlan_hdd_main.h"
 #include "wma.h"
+#include "ol_txrx_api.h"
+#include "pktlog_ac.h"
 #endif
 #include <wlan_logging_sock_svc.h>
 #include <kthread.h>
@@ -48,8 +50,6 @@
 #include <wlan_ptt_sock_svc.h>
 #include <host_diag_core_event.h>
 #include "host_diag_core_log.h"
-#include "ol_txrx_api.h"
-#include "pktlog_ac.h"
 
 #ifdef CNSS_GENL
 #include <net/cnss_nl.h>