diff -urN -X /usr/share/dontdiff linux.vanilla/drivers/video/sgivwfb.c linux/drivers/video/sgivwfb.c
--- linux.vanilla/drivers/video/sgivwfb.c	Sun Sep  1 02:05:12 2002
+++ linux/drivers/video/sgivwfb.c	Wed Nov 20 17:55:19 2002
@@ -23,17 +23,18 @@
 #include <asm/uaccess.h>
 #include <linux/fb.h>
 #include <linux/init.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
 
 #include <video/fbcon.h>
 
 #define INCLUDE_TIMING_TABLE_DATA
-#define DBE_REG_BASE regs
-#include <video/sgivw.h>
+#define DBE_REG_BASE default_par.regs
+#include <asm/sgi-vwdbe.h>
 
 struct sgivw_par {
-	asregs *regs;
+	struct asregs *regs;
 	u32 cmap_fifo;
 	u_long timing_num;
 };
@@ -46,8 +47,8 @@
  */
 
 /* set by arch/i386/kernel/setup.c */
-u_long sgivwfb_mem_phys;
-u_long sgivwfb_mem_size;
+extern unsigned long sgivwfb_mem_phys;
+extern unsigned long sgivwfb_mem_size;
 
 static struct fb_info fb_info;
 static struct sgivw_par default_par;
@@ -60,7 +61,7 @@
         .visual		= FB_VISUAL_PSEUDOCOLOR,
 	.mmio_start	= DBE_REG_PHYS,
 	.mmio_len	= DBE_REG_SIZE,
-        .accel_flags	= FB_ACCEL_NONE
+        .accel		= FB_ACCEL_NONE,
 };
 
 static struct fb_var_screeninfo sgivwfb_var __initdata = {
@@ -226,7 +223,7 @@
 static int sgivwfb_check_var(struct fb_var_screeninfo *var, 
 			     struct fb_info *info)
 {
-	int err, activate = var->activate;
+//	int activate = var->activate;
 	struct dbe_timing_info *timing;
 	u_long line_length;
 	u_long min_mode;
@@ -240,8 +237,8 @@
 
 	if (var->vmode & FB_VMODE_CONUPDATE) {
 		var->vmode |= FB_VMODE_YWRAP;
-		var->xoffset = display->var.xoffset;
-		var->yoffset = display->var.yoffset;
+		var->xoffset = disp.var.xoffset;		/* FIXME */
+		var->yoffset = disp.var.yoffset;		/* FIXME */
 	}
 
 	/* XXX FIXME - forcing var's */
@@ -350,7 +346,7 @@
 
 	/* Ouch. This breaks the rules but timing_num is only important if you
 	* change a video mode */
-	par->timing_num = min_mode;
+	default_par.timing_num = min_mode;		/* XXX ? */
 
 	printk(KERN_INFO "sgivwfb: new video mode xres=%d yres=%d bpp=%d\n",
 		var->xres, var->yres, var->bits_per_pixel);
@@ -369,7 +365,7 @@
 	u32 readVal, outputVal;
 	int wholeTilesX, maxPixelsPerTileX;
 	int frmWrite1, frmWrite2, frmWrite3b;
-	dbe_timing_info_t *currentTiming;	/* Current Video Timing */
+	struct dbe_timing_info *currentTiming;	/* Current Video Timing */
 	int xpmax, ypmax;	// Monitor resolution
 	int bytesPerPixel;	// Bytes per pixel
 
@@ -705,11 +675,17 @@
 	printk(KERN_INFO "sgivwfb: framebuffer at 0x%lx, size %ldk\n",
 	       sgivwfb_mem_phys, sgivwfb_mem_size / 1024);
 
-	default_par.regs = (asregs *) ioremap_nocache(DBE_REG_PHYS, DBE_REG_SIZE);
+	if (!request_mem_region(DBE_REG_PHYS, DBE_REG_SIZE, "sgivwfb")) {
+		printk(KERN_ERR "sgivwfb: couldn't reserve mmio region\n");
+		goto fail_request_mem_region;
+	}
+
+	default_par.regs = (struct asregs *) ioremap_nocache(DBE_REG_PHYS, DBE_REG_SIZE);
 	if (!default_par.regs) {
 		printk(KERN_ERR "sgivwfb: couldn't ioremap registers\n");
 		goto fail_ioremap_regs;
 	}
+
 #ifdef CONFIG_MTRR
 	mtrr_add((unsigned long) sgivwfb_mem_phys, sgivwfb_mem_size,
 		 MTRR_TYPE_WRCOMB, 1);
@@ -726,7 +702,7 @@
 	fb_info.fix = sgivwfb_fix;
 	fb_info.var = sgivwfb_var;
 	fb_info.fbops = &sgivwfb_ops;
-	fb_info.pseudo_palette = pseudo_palette;
+	fb_info.pseudo_palette = fb_info.pseudo_palette;
 	fb_info.par = &default_par;
 	fb_info.disp = &disp;
 	fb_info.currcon = -1;
@@ -734,51 +710,49 @@
 	fb_info.updatevar = gen_update_var;
 	fb_info.flags = FBINFO_FLAG_DEFAULT;
 
-	fb_info.screen_base =
-	    ioremap_nocache((unsigned long) sgivwfb_mem_phys,
-			    sgivwfb_mem_size);
+	fb_info.screen_base = ioremap_nocache((unsigned long) sgivwfb_mem_phys, sgivwfb_mem_size);
 	if (!fb_info.screen_base) {
 		printk(KERN_ERR "sgivwfb: couldn't ioremap screen_base\n");
 		goto fail_ioremap_fbmem;
 	}
 
 	/* turn on default video mode */
-	gen_set_var(&fb_info->var, -1, &fb_info);
+	gen_set_var(&fb_info.var, -1, &fb_info);
 
 	if (register_framebuffer(&fb_info) < 0) {
-		printk(KERN_ERR
-		       "sgivwfb: couldn't register framebuffer\n");
+		printk(KERN_ERR "sgivwfb: couldn't register framebuffer\n");
 		goto fail_register_framebuffer;
 	}
 
-	printk(KERN_INFO
-	       "fb%d: Virtual frame buffer device, using %ldK of video memory\n",
+	printk(KERN_INFO "fb%d: SGI DBE frame buffer device, using %ldK of video memory\n",
 	       GET_FB_IDX(fb_info.node), sgivwfb_mem_size >> 10);
 
 	return 0;
 
-      fail_register_framebuffer:
+fail_register_framebuffer:
 	iounmap((char *) fb_info.screen_base);
-      fail_ioremap_fbmem:
+
+fail_ioremap_fbmem:
 	iounmap(default_par.regs);
-      fail_ioremap_regs:
-	return -ENXIO;
-}
 
-#ifdef MODULE
-MODULE_LICENSE("GPL");
+fail_ioremap_regs:
+	release_mem_region(DBE_REG_PHYS, DBE_REG_SIZE);
 
-int init_module(void)
-{
-	return sgivwfb_init();
+fail_request_mem_region:
+	return -ENXIO;
 }
 
-void cleanup_module(void)
+static void __exit sgivwfb_exit(void)
 {
 	unregister_framebuffer(&fb_info);
 	dbe_TurnOffDma();
-	iounmap(regs);
+	iounmap(default_par.regs);
 	iounmap(&fb_info.screen_base);
 }
 
-#endif				/* MODULE */
+//module_init(sgivwfb_init);
+module_exit(sgivwfb_exit);
+
+MODULE_AUTHOR("Jeffrey Newquist <newquist@engr.sgi.com>");
+MODULE_DESCRIPTION("SGI DBE frame buffer device");
+MODULE_LICENSE("GPL");