Merge e44a22665b0c7c0b5971b7db6fa56d5958a82894 on remote branch

Change-Id: Iec6ff7989e967830852594941c7fdb0e4ed69461

cnss2/Makefile

@@ -11,6 +11,7 @@ ifeq ($(CONFIG_CNSS_HW_SECURE_DISABLE), y)
 ccflags-y += -I$(WLAN_PLATFORM_ROOT)/../../securemsm-kernel/smcinvoke/
 ccflags-y += -I$(WLAN_PLATFORM_ROOT)/../../securemsm-kernel/linux/
 ccflags-y += -I$(WLAN_PLATFORM_ROOT)/../../securemsm-kernel/include/linux/
+ccflags-y += -I$(WLAN_PLATFORM_ROOT)/../../securemsm-kernel/include/uapi/linux/
 endif
 
 obj-$(CONFIG_CNSS2) += cnss2.o

icnss2/main.h

@@ -14,7 +14,6 @@
 #include <linux/power_supply.h>
 #if IS_ENABLED(CONFIG_MSM_QMP)
 #include <linux/mailbox/qmp.h>
-#include <linux/soc/qcom/qcom_aoss.h>
 #endif
 #ifdef CONFIG_CNSS_OUT_OF_TREE
 #include "icnss2.h"

icnss2/power.c

@@ -13,6 +13,9 @@
 #include "qmi.h"
 #include "debug.h"
 #include "power.h"
+#if IS_ENABLED(CONFIG_MSM_QMP)
+#include <linux/soc/qcom/qcom_aoss.h>
+#endif
 
 static struct icnss_vreg_cfg icnss_wcn6750_vreg_list[] = {
 	{"vdd-cx-mx", 824000, 952000, 0, 0, 0, false, true},