diff options
| author | Maxime Ripard <[email protected]> | 2019-02-11 09:35:35 +0000 |
|---|---|---|
| committer | Maxime Ripard <[email protected]> | 2019-02-11 09:35:35 +0000 |
| commit | d588100baa28dae6a5c32d02bfe744d0792ed2ad (patch) | |
| tree | 3be3984cea35a07b4259f8ebe55ce0e52e416d1c /drivers/gpu/drm/i915/intel_dp_mst.c | |
| parent | drm/doc: Remove solved KMS cleanup task (diff) | |
| parent | drm/virtio: do NOT reuse resource ids (diff) | |
| download | kernel-d588100baa28dae6a5c32d02bfe744d0792ed2ad.tar.gz kernel-d588100baa28dae6a5c32d02bfe744d0792ed2ad.zip | |
Merge drm/drm-next into drm-misc-next
We need to backmerge drm-next to fix the komeda build failure.
Signed-off-by: Maxime Ripard <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 5d8471f080d9..fb67cd931117 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -242,7 +242,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, struct intel_connector *connector = to_intel_connector(conn_state->connector); int ret; - uint32_t temp; + u32 temp; /* MST encoders are bound to a crtc, not to a connector, * force the mapping here for get_hw_state. |