Commit 061fa91f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ATI Mach64 build fix

From: Geert Uytterhoeven <geert@linux-m68k.org>

Atyfb: Add missing parts of reversal of Mobility changes, allowing ATI Mach64
GX support to compile again.
parent 03b83710
...@@ -119,7 +119,7 @@ static int aty_set_dac_514(const struct fb_info *info, ...@@ -119,7 +119,7 @@ static int aty_set_dac_514(const struct fb_info *info,
} }
static int aty_var_to_pll_514(const struct fb_info *info, u32 vclk_per, static int aty_var_to_pll_514(const struct fb_info *info, u32 vclk_per,
u32 bpp, u32 width, union aty_pll *pll) u8 bpp, union aty_pll *pll)
{ {
/* /*
* FIXME: use real calculations instead of using fixed values from the old * FIXME: use real calculations instead of using fixed values from the old
...@@ -338,7 +338,7 @@ const struct aty_dac_ops aty_dac_att21c498 = { ...@@ -338,7 +338,7 @@ const struct aty_dac_ops aty_dac_att21c498 = {
*/ */
static int aty_var_to_pll_18818(const struct fb_info *info, u32 vclk_per, static int aty_var_to_pll_18818(const struct fb_info *info, u32 vclk_per,
u32 bpp, u32 width, union aty_pll *pll) u8 bpp, union aty_pll *pll)
{ {
u32 MHz100; /* in 0.01 MHz */ u32 MHz100; /* in 0.01 MHz */
u32 program_bits; u32 program_bits;
...@@ -494,7 +494,7 @@ const struct aty_pll_ops aty_pll_ati18818_1 = { ...@@ -494,7 +494,7 @@ const struct aty_pll_ops aty_pll_ati18818_1 = {
*/ */
static int aty_var_to_pll_1703(const struct fb_info *info, u32 vclk_per, static int aty_var_to_pll_1703(const struct fb_info *info, u32 vclk_per,
u32 bpp, u32 width, union aty_pll *pll) u32 vclk_per, u8 bpp, union aty_pll *pll)
{ {
u32 mhz100; /* in 0.01 MHz */ u32 mhz100; /* in 0.01 MHz */
u32 program_bits; u32 program_bits;
...@@ -610,7 +610,7 @@ const struct aty_pll_ops aty_pll_stg1703 = { ...@@ -610,7 +610,7 @@ const struct aty_pll_ops aty_pll_stg1703 = {
*/ */
static int aty_var_to_pll_8398(const struct fb_info *info, u32 vclk_per, static int aty_var_to_pll_8398(const struct fb_info *info, u32 vclk_per,
u32 bpp, u32 width, union aty_pll *pll) u32 vclk_per, u8 bpp, union aty_pll *pll)
{ {
u32 tempA, tempB, fOut, longMHz100, diff, preDiff; u32 tempA, tempB, fOut, longMHz100, diff, preDiff;
...@@ -734,7 +734,7 @@ const struct aty_pll_ops aty_pll_ch8398 = { ...@@ -734,7 +734,7 @@ const struct aty_pll_ops aty_pll_ch8398 = {
*/ */
static int aty_var_to_pll_408(const struct fb_info *info, u32 vclk_per, static int aty_var_to_pll_408(const struct fb_info *info, u32 vclk_per,
u32 bpp, u32 width, union aty_pll *pll) u8 bpp, union aty_pll *pll)
{ {
u32 mhz100; /* in 0.01 MHz */ u32 mhz100; /* in 0.01 MHz */
u32 program_bits; u32 program_bits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment