diff -ur -x .depend -x *.o -x *.flags /linux.vanilla/drivers/video/amifb.c /linux/drivers/video/amifb.c
--- /linux.vanilla/drivers/video/amifb.c	Tue Mar 27 20:32:55 2001
+++ /linux/drivers/video/amifb.c	Thu Mar 29 21:02:36 2001
@@ -661,7 +661,7 @@
 	copins *rebuild[2];
 } copdisplay;
 
-static u_short currentcop = 0;
+static u_short currentcop;
 
 	/*
 	 * Hardware Cursor
@@ -742,7 +742,7 @@
 	u_short fmode;		/* vmode */
 } currentpar;
 
-static int currcon = 0;
+static int currcon;
 
 static struct display disp;
 
@@ -770,18 +770,18 @@
 	 * Latches for Display Changes during VBlank
 	 */
 
-static u_short do_vmode_full = 0;	/* Change the Video Mode */
-static u_short do_vmode_pan = 0;	/* Update the Video Mode */
-static short do_blank = 0;		/* (Un)Blank the Screen (±1) */
-static u_short do_cursor = 0;		/* Move the Cursor */
+static u_short do_vmode_full;		/* Change the Video Mode */
+static u_short do_vmode_pan;		/* Update the Video Mode */
+static short do_blank;			/* (Un)Blank the Screen (±1) */
+static u_short do_cursor;		/* Move the Cursor */
 
 
 	/*
 	 * Various Flags
 	 */
 
-static u_short is_blanked = 0;		/* Screen is Blanked */
-static u_short is_lace = 0;		/* Screen is laced */
+static u_short is_blanked;		/* Screen is Blanked */
+static u_short is_lace;			/* Screen is laced */
 
 	/*
 	 * Frame Buffer Name
@@ -929,8 +929,8 @@
 #define DEFMODE_AGA	    19	/* "vga70" for AGA */
 
 
-static int amifb_ilbm = 0;	/* interleaved or normal bitplanes */
-static int amifb_inverse = 0;
+static int amifb_ilbm;		/* interleaved or normal bitplanes */
+static int amifb_inverse;
 
 
 	/*
@@ -1573,7 +1573,7 @@
 	 * Allocate, Clear and Align a Block of Chip Memory
 	 */
 
-static u_long unaligned_chipptr = 0;
+static u_long unaligned_chipptr;
 
 static inline u_long __init chipalloc(u_long size)
 {
@@ -1923,7 +1923,7 @@
 static char __init *strtoke(char *s,const char *ct)
 {
 	char *sbegin, *send;
-	static char *ssave = NULL;
+	static char *ssave;
 
 	sbegin  = s ? s : ssave;
 	if (!sbegin)