From 724e31ade1e00d96ef34e7ec216c6a0b0623ff1f Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 27 Oct 2010 15:33:26 -0700 Subject: [PATCH] --- yaml --- r: 218516 b: refs/heads/master c: 847fb8aca3b79d03ef6c5f87f0843a30ed9e6627 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/matrox/matroxfb_maven.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc4bcf622ae1..c0f4f4ec86e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0a2f357d46a51f8066eb47b3dba40f87a680804 +refs/heads/master: 847fb8aca3b79d03ef6c5f87f0843a30ed9e6627 diff --git a/trunk/drivers/video/matrox/matroxfb_maven.c b/trunk/drivers/video/matrox/matroxfb_maven.c index 1e3e8f19783e..31b8f67477b7 100644 --- a/trunk/drivers/video/matrox/matroxfb_maven.c +++ b/trunk/drivers/video/matrox/matroxfb_maven.c @@ -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) {