Merge drm/drm-next into drm-intel-next

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

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 32f7806ea12ca97a707c6b46c464b6e4af7d3475..15d9a64e7b4c47fccd6cf0cdc82ba7aa263de756 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2995,7 +2995,7 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv)
 
 static void intel_print_wm_latency(struct drm_i915_private *dev_priv,
                                   const char *name,
-                                  const u16 *wm)
+                                  const u16 wm[])
 {
        int level, max_level = ilk_wm_max_level(dev_priv);