From dada577f901a9b6139fbd3702f23c465f6e92279 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Kalikot Veetil Date: Sun, 5 Apr 2020 15:09:30 -0700 Subject: [PATCH] qcacld-3.0: Include config file only after override Include defconfig profile only after processing WLAN_CFG_OVERRIDE. Change-Id: I11164995061ee057dfcb3abaef2af2f2d33bfd23 CRs-Fixed: 2661823 --- Kbuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Kbuild b/Kbuild index 5526b72f8a0e..83ba1b6df2a1 100644 --- a/Kbuild +++ b/Kbuild @@ -31,7 +31,6 @@ ifneq ($(ANDROID_BUILD_TOP),) endif endif -include $(WLAN_ROOT)/configs/$(CONFIG_QCA_CLD_WLAN_PROFILE)_defconfig # add configurations in WLAN_CFG_OVERRIDE ifneq ($(WLAN_CFG_OVERRIDE),) @@ -45,6 +44,8 @@ include $(WLAN_CFG_OVERRIDE_FILE) $(warning "Overriding WLAN config with: $(shell cat $(WLAN_CFG_OVERRIDE_FILE))") endif +include $(WLAN_ROOT)/configs/$(CONFIG_QCA_CLD_WLAN_PROFILE)_defconfig + ############ UAPI ############ UAPI_DIR := uapi UAPI_INC := -I$(WLAN_ROOT)/$(UAPI_DIR)/linux