Merge "disp: fix compilation issue with trusted VM config"

Makefile

@@ -9,6 +9,7 @@ ifeq ($(CONFIG_ARCH_KONA), y)
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/konadispconf.h
 endif
 
+ifneq ($(CONFIG_ARCH_QTI_VM), y)
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
      ifeq ($(CONFIG_QGKI), y)
 		include $(srctree)/techpack/display/config/lahainadisp.conf
@@ -17,11 +18,13 @@ LINUXINCLUDE    += -include $(srctree)/techpack/display/config/lahainadispconf.h
 		include $(srctree)/techpack/display/config/gki_lahainadisp.conf
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_lahainadispconf.h
      endif
+endif
+endif
+
 LINUXINCLUDE    += \
 		   -I$(srctree)/techpack/display/include/uapi/display \
 		   -I$(srctree)/techpack/display/include
 USERINCLUDE     += -I$(srctree)/techpack/display/include/uapi/display
-endif
 
 ifeq ($(CONFIG_ARCH_LITO), y)
 include $(srctree)/techpack/display/config/saipdisp.conf