aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-07-25 01:18:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 14:55:14 -0400
commit243dd2809a5edd2e0e3e62781083aa44049af37d (patch)
tree2e3b28cc31dd2ff2b9121f12be71e6eba1806cc5
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>
-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)
129{ 129{
130 /* FIXME: Can we do this as a sleep ? */ 130 /* FIXME: Can we do this as a sleep ? */
131 /* Wait for 20ms, i.e. one cycle at 50hz. */ 131 /* Wait for 20ms, i.e. one cycle at 50hz. */
132 udelay(20000); 132 mdelay(20);
133} 133}
134 134
135static void scu_busy_loop(void *scu_base) 135static void scu_busy_loop(void *scu_base)