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

Makefile

@@ -9,7 +9,6 @@ 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
@@ -19,7 +18,6 @@ LINUXINCLUDE    += -include $(srctree)/techpack/display/config/lahainadispconf.h
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_lahainadispconf.h
      endif
 endif
-endif
 
 ifeq ($(CONFIG_ARCH_HOLI), y)
      ifeq ($(CONFIG_QGKI), y)