]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
gma500: udlay(20000) is too large
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 25 Jul 2011 01:13:13 +0000 (11:13 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jul 2011 03:42:47 +0000 (20:42 -0700)
So use mdelay(20) instead.  Fixes this build error:

  ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/staging/gma500/psb_intel_display.c

index 4f47d09d65de73121d438f90a058b886692a5043..09e378d5ddcbab68a0be575925c5debac07cb177 100644 (file)
@@ -331,7 +331,7 @@ static bool psb_intel_find_best_PLL(struct drm_crtc *crtc, int target,
 void psb_intel_wait_for_vblank(struct drm_device *dev)
 {
        /* Wait for 20ms, i.e. one cycle at 50hz. */
-       udelay(20000);
+       mdelay(20);
 }
 
 int psb_intel_pipe_set_base(struct drm_crtc *crtc,