From 9e048c53291dda8eb1fe15bd6e33c518134d83dd Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Thu, 26 Nov 2009 14:22:41 +0800
Subject: [PATCH] --- yaml --- r: 174546 b: refs/heads/master c:
 311089d3d372c6f2b01a6d8a5ed7fcbcd9ad7621 h: refs/heads/master 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 4b6b0e95efe8..b4b1664794dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1991bdfaf5897b6fbfdc7dce81508f7cbc044768
+refs/heads/master: 311089d3d372c6f2b01a6d8a5ed7fcbcd9ad7621
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index a1833cbfaafd..b6251cdd4ebf 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -950,7 +950,7 @@ void
 intel_wait_for_vblank(struct drm_device *dev)
 {
 	/* Wait for 20ms, i.e. one cycle at 50hz. */
-	mdelay(20);
+	msleep(20);
 }
 
 /* Parameters have changed, update FBC info */