diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2011-07-25 11:13:13 +1000 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 20:42:47 -0700 |
| commit | 933b44732caad0c3b65224453c54846c75d97936 (patch) | |
| tree | 81b3bfe953f0c3f6417fc056810204ae9f0a6081 | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-933b44732caad0c3b65224453c54846c75d97936.tar.xz linux-dev-933b44732caad0c3b65224453c54846c75d97936.zip | |
gma500: udlay(20000) is too large
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>
| -rw-r--r-- | drivers/staging/gma500/psb_intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index 4f47d09d65de..09e378d5ddcb 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -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, |