diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/video/matrox/matroxfb_maven.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/video/matrox/matroxfb_maven.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_maven.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 1e3e8f19783e..31b8f67477b7 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c | |||
| @@ -280,7 +280,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll, | |||
| 280 | return fxtal * (*feed) / (*in) * ctl->den; | 280 | return fxtal * (*feed) / (*in) * ctl->den; |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | static unsigned int matroxfb_mavenclock(const struct matrox_pll_ctl* ctl, | 283 | static int matroxfb_mavenclock(const struct matrox_pll_ctl *ctl, |
| 284 | unsigned int htotal, unsigned int vtotal, | 284 | unsigned int htotal, unsigned int vtotal, |
| 285 | unsigned int* in, unsigned int* feed, unsigned int* post, | 285 | unsigned int* in, unsigned int* feed, unsigned int* post, |
| 286 | unsigned int* htotal2) { | 286 | unsigned int* htotal2) { |