From: Geert Uytterhoeven <geert@linux-m68k.org>
Atyfb: Add missing parts of reversal of Mobility changes, allowing ATI Mach64
GX support to compile again.
drivers/video/aty/mach64_gx.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/video/aty/mach64_gx.c~mach64-build-fix drivers/video/aty/mach64_gx.c
--- 25/drivers/video/aty/mach64_gx.c~mach64-build-fix 2003-04-15 23:27:45.000000000 -0700
+++ 25-akpm/drivers/video/aty/mach64_gx.c 2003-04-15 23:27:45.000000000 -0700
@@ -119,7 +119,7 @@ static int aty_set_dac_514(const struct
}
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
@@ -338,7 +338,7 @@ const struct aty_dac_ops aty_dac_att21c4
*/
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 program_bits;
@@ -494,7 +494,7 @@ const struct aty_pll_ops aty_pll_ati1881
*/
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 program_bits;
@@ -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,
- u32 bpp, u32 width, union aty_pll *pll)
+ u32 vclk_per, u8 bpp, union aty_pll *pll)
{
u32 tempA, tempB, fOut, longMHz100, diff, preDiff;
@@ -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,
- u32 bpp, u32 width, union aty_pll *pll)
+ u8 bpp, union aty_pll *pll)
{
u32 mhz100; /* in 0.01 MHz */
u32 program_bits;
_