From 530edbd8652ac5719e8f2cee86643a4947ac3c14 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 20 Jul 2012 10:30:45 +0200
Subject: [PATCH] --- yaml --- r: 318771 b: refs/heads/master c:
 35313cde4c582f3581a4b8397311f302680625f5 h: refs/heads/master i:   318769:
 4b1c37e540b99ad37ed5ee0689a61546fbdaaeb5   318767:
 eea500793dbac1de5e1509aa9f46940bacdf428b v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2d6af3a36320..1033654d6424 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 520c41cf2fa029d1e8b923ac2026f96664f17c4b
+refs/heads/master: 35313cde4c582f3581a4b8397311f302680625f5
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index c9b69e3b2c29..e9e476eca89f 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3573,7 +3573,7 @@ void intel_encoder_destroy(struct drm_encoder *encoder)
 }
 
 static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,
-				  struct drm_display_mode *mode,
+				  const struct drm_display_mode *mode,
 				  struct drm_display_mode *adjusted_mode)
 {
 	struct drm_device *dev = crtc->dev;