diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-28 04:00:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-28 04:00:25 -0700 |
| commit | 7adc4e13a4895e7f66b0cfe15d1f0dc60c847de0 (patch) | |
| tree | 1fc910afa159be1bf370e7a5ae14ee556826d7e6 /drivers/gpu | |
| parent | 2eb95c6cb2b8b717b90ff28da5bd6cea52f6918b (diff) | |
| parent | 6a36454b0a35e4ec57fce4f80602dc008750ea49 (diff) | |
Merge "defconfig: msm: Define common hypervisor flag"
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm-hyp/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/Kconfig | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm-hyp/Kconfig b/drivers/gpu/drm/msm-hyp/Kconfig index 676c0174c0ee..2a40a4bf036a 100644 --- a/drivers/gpu/drm/msm-hyp/Kconfig +++ b/drivers/gpu/drm/msm-hyp/Kconfig @@ -6,7 +6,7 @@ config DRM_MSM_HYP tristate "MSM DRM HYP" depends on DRM - depends on MSM_GVM_QUIN + depends on MSM_GVM depends on OF default y help diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index cb3b25ddd0da..5d390abef6bd 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -4,6 +4,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on OF + depends on !MSM_GVM select REGULATOR select DRM_KMS_HELPER select DRM_PANEL |