Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258425
b: refs/heads/master
c: 933b447
h: refs/heads/master
i:
  258423: 976c394
v: v3
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Jul 25, 2011
1 parent 10171e8 commit 0af8083
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1f3b8eab7491b6d9c2f03dfaaa7cb66a156f94c
refs/heads/master: 933b44732caad0c3b65224453c54846c75d97936
2 changes: 1 addition & 1 deletion trunk/drivers/staging/gma500/psb_intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 0af8083

Please sign in to comment.