From 72ea9ed0f1ec766ca997c8e42b22239da4e81d6d Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 23 Mar 2009 13:36:25 -0700
Subject: [PATCH] --- yaml --- r: 139841 b: refs/heads/master c:
 580982d399071474c349538b7f5780bc79b54e7f h: refs/heads/master i:   139839:
 1bf8253cbd0483cf20438f58bca78336dd717a06 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 103c34a09415..f6ae19454681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca58282089b11f64b911618036ee7676f12735b
+refs/heads/master: 580982d399071474c349538b7f5780bc79b54e7f
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index d9c50ff94d76..0b33760b04cb 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -636,7 +636,7 @@ void
 intel_wait_for_vblank(struct drm_device *dev)
 {
 	/* Wait for 20ms, i.e. one cycle at 50hz. */
-	udelay(20000);
+	mdelay(20);
 }
 
 static int