Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218516
b: refs/heads/master
c: 847fb8a
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Oct 28, 2010
1 parent f5283af commit 724e31a
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: f0a2f357d46a51f8066eb47b3dba40f87a680804
refs/heads/master: 847fb8aca3b79d03ef6c5f87f0843a30ed9e6627
2 changes: 1 addition & 1 deletion trunk/drivers/video/matrox/matroxfb_maven.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll,
return fxtal * (*feed) / (*in) * ctl->den;
}

static unsigned int matroxfb_mavenclock(const struct matrox_pll_ctl* ctl,
static int matroxfb_mavenclock(const struct matrox_pll_ctl *ctl,
unsigned int htotal, unsigned int vtotal,
unsigned int* in, unsigned int* feed, unsigned int* post,
unsigned int* htotal2) {
Expand Down

0 comments on commit 724e31a

Please sign in to comment.