commit 36199cb0873cb1616d329d55b09239d56493b902
author Venkata Sharath Chandra Manchala <vmanchal@codeaurora.org> Wed Jul 18 12:27:54 2018 -0700
committer nshrivas <nshrivas@codeaurora.org> Tue Aug 14 21:44:10 2018 -0700
tree f2393a9dea72085294298ff23f92cab9cc579a0a
parent b6441f2c7280013ad965f6bb570f168e8258acff

qcacld-3.0: Remove CONFIG_QCA6390_11AX flag

Remove CONFIG_QCA6390_11AX flag as QCA6390 is
11AX enabled by default.

Change-Id: Ie2e2ee446bfc0c67fdbeec2ec30dc1c97cfa5dee
CRs-Fixed: 2292042

Kbuild

diff --git a/Kbuild b/Kbuild
index f1c8a0f..4714c10 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1490,15 +1490,18 @@
 PLD_OBJS +=	$(PLD_SRC_DIR)/pld_usb.o
 endif
 
+TARGET_INC := 	-I$(WLAN_ROOT)/../fw-api/fw
+
+ifeq ($(CONFIG_CNSS_QCA6290), y)
 ifeq ($(CONFIG_QCA6290_11AX), y)
-TARGET_INC :=	-I$(WLAN_ROOT)/../fw-api/hw/qca6290/11ax/v2 \
-		-I$(WLAN_ROOT)/../fw-api/fw
-else ifeq ($(CONFIG_QCA6390_11AX), y)
-TARGET_INC :=	-I$(WLAN_ROOT)/../fw-api/hw/qca6390/v1 \
-		-I$(WLAN_ROOT)/../fw-api/fw
+TARGET_INC +=	-I$(WLAN_ROOT)/../fw-api/hw/qca6290/11ax/v2
 else
-TARGET_INC :=	-I$(WLAN_ROOT)/../fw-api/hw/qca6290/v2 \
-		-I$(WLAN_ROOT)/../fw-api/fw
+TARGET_INC +=	-I$(WLAN_ROOT)/../fw-api/hw/qca6290/v2
+endif
+endif
+
+ifeq ($(CONFIG_CNSS_QCA6390), y)
+TARGET_INC +=	-I$(WLAN_ROOT)/../fw-api/hw/qca6390/v1
 endif
 
 LINUX_INC :=	-Iinclude