qcacld-3.0: Use correct flag to compile USB-PLD file
Currently we are using different flags to enable compilation of pld_usb.c
and one to enable/disable PLD USB stub functions. Use the same flag for
both cases - CONFIG_PLD_USB_CNSS
Change-Id: Icc89405d785f3fc0ebc4a97d234013ac86ebd068
CRs-Fixed: 1076326
diff --git a/Kbuild b/Kbuild
index c6ea5d2..ac31aff 100644
--- a/Kbuild
+++ b/Kbuild
@@ -246,6 +246,7 @@
#Enable USB specific APIS
ifeq ($(CONFIG_ROME_IF),usb)
CONFIG_HIF_USB := 1
+ CONFIG_PLD_USB_CNSS := y
endif
#Enable pci read/write config functions
@@ -970,7 +971,7 @@
ifeq ($(CONFIG_CNSS_SDIO),y)
PLD_OBJS += $(PLD_SRC_DIR)/pld_sdio.o
endif
-ifeq ($(CONFIG_USB), y)
+ifeq ($(CONFIG_PLD_USB_CNSS), y)
PLD_OBJS += $(PLD_SRC_DIR)/pld_usb.o
endif
@@ -1315,7 +1316,8 @@
#Enable USB specific APIS
ifeq ($(CONFIG_HIF_USB), 1)
CDEFINES += -DHIF_USB \
- -DCONFIG_HL_SUPPORT
+ -DCONFIG_PLD_USB_CNSS \
+ -DCONFIG_HL_SUPPORT
endif
#Enable FW logs through ini
diff --git a/core/pld/src/pld_usb.c b/core/pld/src/pld_usb.c
index 76ac2fa..26ce211 100644
--- a/core/pld/src/pld_usb.c
+++ b/core/pld/src/pld_usb.c
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#include "pld_common.h"
+#include "pld_usb.h"
#include "pld_internal.h"
#include <linux/atomic.h>
@@ -208,4 +208,3 @@
usb_deregister(&pld_usb_ops);
pr_info("%s usb_deregister done!\n", __func__);
}
-