2.5.21 -- aty128fb.c: aty128fb.c:1775: `con' undeclared

[A Guy Called Tyketto]

        I'll throw one in too:

make[2]: Entering directory `/usr/src/linux-2.5.20/drivers/video'
  gcc -Wp,-MD,.aty128fb.o.d -D__KERNEL__ -I/usr/src/linux-2.5.20/include -Wall 
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer 
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 
-march=i686 -malign-functions=4  -nostdinc -iwithprefix include    
-DKBUILD_BASENAME=aty128fb   -c -o aty128fb.o aty128fb.c
aty128fb.c: In function `aty128_init':
aty128fb.c:1775: `con' undeclared (first use in this function)
aty128fb.c:1775: (Each undeclared identifier is reported only once
aty128fb.c:1775: for each function it appears in.)
aty128fb.c:1776: incompatible type for argument 1 of `fb_alloc_cmap'
aty128fb.c:1662: warning: `size' might be used uninitialized in this function
make[2]: *** [aty128fb.o] Error 1
make[2]: Leaving directory `/usr/src/linux-2.5.20/drivers/video'
make[1]: *** [_subdir_video] Error 2
make[1]: Leaving directory `/usr/src/linux-2.5.20/drivers'
make: *** [drivers] Error 2

        lines 1775-1776 are:

    size = (fb_display[con].var.bits_per_pixel <= 8) ? 256 : 32;
    fb_alloc_cmap(info->fb_info.cmap, size, 0);

        fb_display[] seems to be the culprit. It's an array, in which has the 
'con' field, which is of type int. In all other functions where this array is 
used, 'con' is passed to the function as type int. It seems to be missing for 
this one.

        Backing out of the change seems to work, as this was added in the 
2.5.21 patch, but I'd rather like to know what the proper solution is..

                                                        BL.

        Relevant parts of config below.

CONFIG_FB=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_VIDEO_SELECT=y
CONFIG_FB_ATY=y
CONFIG_FB_ATY_CT=y
CONFIG_FB_RADEON=y
CONFIG_FB_ATY128=y
CONFIG_FBCON_ADVANCED=y
CONFIG_FBCON_CFB8=y
CONFIG_FBCON_CFB16=y
CONFIG_FBCON_CFB24=y
CONFIG_FBCON_CFB32=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y

-- 
Brad Littlejohn                         | Email:        [e-mail]
Unix Systems Administrator,             |           [e-mail]
Web + NewsMaster, BOFH.. Smeghead! :)   |   http://www.wizard.com/~tyketto
  PGP: 1024D/E319F0BF 6980 AAD6 7329 E9E6 D569  F620 C819 199A E319 F0BF