aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-07-25 15:18:44 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 11:55:14 -0700
commit243dd2809a5edd2e0e3e62781083aa44049af37d (patch)
tree2e3b28cc31dd2ff2b9121f12be71e6eba1806cc5 /drivers/staging
parent9c646cfc3d98f2e595f7757e42ff59286c6f327e (diff)
gma500: udelay(20000) it too long again
so replace it with mdelay(20). Fixes 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/gma500/mrst_hdmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gma500/mrst_hdmi.c b/drivers/staging/gma500/mrst_hdmi.c
index d6a517971ba..e66607eb3d3 100644
--- a/drivers/staging/gma500/mrst_hdmi.c
+++ b/drivers/staging/gma500/mrst_hdmi.c
@@ -129,7 +129,7 @@ static void wait_for_vblank(struct drm_device *dev)
{
/* FIXME: Can we do this as a sleep ? */
/* Wait for 20ms, i.e. one cycle at 50hz. */
- udelay(20000);
+ mdelay(20);
}
static void scu_busy_loop(void *scu_base)