diff -ur -x .depend -x *.o -x *.flags /linux.vanilla/drivers/video/vesafb.c /linux//drivers/video/vesafb.c --- /linux.vanilla/drivers/video/vesafb.c Tue Mar 27 20:32:57 2001 +++ /linux//drivers/video/vesafb.c Thu Mar 29 22:13:55 2001 @@ -59,22 +59,11 @@ /* --------------------------------------------------------------------- */ static struct fb_var_screeninfo vesafb_defined = { - 0,0,0,0, /* W,H, W, H (virtual) load xres,xres_virtual*/ - 0,0, /* virtual -> visible no offset */ - 8, /* depth -> load bits_per_pixel */ - 0, /* greyscale ? */ - {0,0,0}, /* R */ - {0,0,0}, /* G */ - {0,0,0}, /* B */ - {0,0,0}, /* transparency */ - 0, /* standard pixel format */ - FB_ACTIVATE_NOW, - -1,-1, - 0, - 0L,0L,0L,0L,0L, - 0L,0L,0, /* No sync info */ - FB_VMODE_NONINTERLACED, - {0,0,0,0,0,0} + bits_per_pixel: 8, /* depth -> load bits_per_pixel */ + activate: FB_ACTIVATE_NOW, + height: -1, + width: -1, + vmode: FB_VMODE_NONINTERLACED, }; static struct display disp; @@ -92,13 +81,13 @@ #endif } fbcon_cmap; -static int inverse = 0; -static int mtrr = 0; -static int currcon = 0; +static int inverse; +static int mtrr; +static int currcon; -static int pmi_setpal = 0; /* pmi for palette changes ??? */ -static int ypan = 0; /* 0..nothing, 1..ypan, 2..ywrap */ -static unsigned short *pmi_base = 0; +static int pmi_setpal; /* pmi for palette changes ??? */ +static int ypan; /* 0..nothing, 1..ypan, 2..ywrap */ +static unsigned short *pmi_base; static void (*pmi_start)(void); static void (*pmi_pal)(void);