Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ad6641d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I36a55b91,Icc225bd1 into display-kernel.lnx.1.0 

* changes:
  disp: msm: sde: update shmbridge header file path
  disp: msm: delay msm_drv probe
parents afc6d5a4 a92ea43b

msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ static void __exit msm_drm_unregister(void) 
	msm_smmu_driver_cleanup();

}



module_init(msm_drm_register);

late_initcall(msm_drm_register);

module_exit(msm_drm_unregister);



MODULE_AUTHOR("Rob Clark <robdclark@gmail.com");

msm/sde/sde_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


#include <soc/qcom/scm.h>

#include "soc/qcom/secure_buffer.h"

#include "soc/qcom/qtee_shmbridge.h"

#include <linux/qtee_shmbridge.h>



#define CREATE_TRACE_POINTS

#include "sde_trace.h"