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
This commit is contained in:
Linux Build Service Account 2019-12-09 12:26:54 -08:00 committed by Gerrit - the friendly Code Review server
commit 6ad6641d3a
2 changed files with 2 additions and 2 deletions

View File

@ -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");

View File

@ -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"