Merge tag 'drm-misc-next-2019-02-01' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_dp_mst.c

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index b61e291367b439aed63012bf034b409f7b790fb3..cdb83d294cdd397efd3a1c5f95f2853f2733282b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -247,7 +247,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.