diff -ur -x .depend -x *.o -x *.flags /linux.vanilla/drivers/video/atafb.c /linux/drivers/video/atafb.c
--- /linux.vanilla/drivers/video/atafb.c	Tue Mar 27 20:32:55 2001
+++ /linux/drivers/video/atafb.c	Thu Mar 29 21:04:50 2001
@@ -89,9 +89,9 @@
 #define up(x, r) (((x) + (r) - 1) & ~((r)-1))
 
 
-static int default_par=0;	/* default resolution (0=none) */
+static int default_par;		/* default resolution (0=none) */
 
-static unsigned long default_mem_req=0;
+static unsigned long default_mem_req;
 
 static int hwscroll=-1;
 
@@ -99,7 +99,7 @@
 
 static int sttt_xres=640,st_yres=400,tt_yres=480;
 static int sttt_xres_virtual=640,sttt_yres_virtual=400;
-static int ovsc_offset=0, ovsc_addlen=0;
+static int ovsc_offset, ovsc_addlen;
 
 static struct atafb_par {
 	void *screen_base;
@@ -139,7 +139,7 @@
 /* Don't calculate an own resolution, and thus don't change the one found when
  * booting (currently used for the Falcon to keep settings for internal video
  * hardware extensions (e.g. ScreenBlaster)  */
-static int DontCalcRes = 0; 
+static int DontCalcRes; 
 
 #ifdef ATAFB_FALCON
 #define HHT hw.falcon.hht
@@ -171,11 +171,11 @@
 
 static int screen_len;
 
-static int current_par_valid=0; 
+static int current_par_valid; 
 
-static int currcon=0;
+static int currcon;
 
-static int mono_moni=0;
+static int mono_moni;
 
 static struct display disp;
 
@@ -192,9 +192,9 @@
 
 static unsigned			external_depth;
 static int				external_pmode;
-static void *external_addr = 0;
+static void *external_addr;
 static unsigned long	external_len;
-static unsigned long	external_vgaiobase = 0;
+static unsigned long	external_vgaiobase;
 static unsigned int		external_bitspercol = 6;
 
 /* 
@@ -242,7 +242,7 @@
 #endif /* ATAFB_EXT */
 
 
-static int inverse=0;
+static int inverse;
 
 extern int fontheight_8x8;
 extern int fontwidth_8x8;
@@ -1469,9 +1469,9 @@
 }
 
 
-static int f_change_mode = 0;
+static int f_change_mode;
 static struct falcon_hw f_new_mode;
-static int f_pan_display = 0;
+static int f_pan_display;
 
 static void falcon_get_par( struct atafb_par *par )
 {
@@ -2865,7 +2865,7 @@
 static char * strtoke(char * s,const char * ct)
 {
   char *sbegin, *send;
-  static char *ssave = NULL;
+  static char *ssave;
   
   sbegin  = s ? s : ssave;
   if (!sbegin) {