patch-2.3.48 linux/drivers/sgi/char/newport.c

• Lines: 43
• Date: Thu Feb 24 22:51:08 2000
• Orig file: v2.3.47/linux/drivers/sgi/char/newport.c
• Orig date: Wed Jun 30 11:24:55 1999

diff -u --recursive --new-file v2.3.47/linux/drivers/sgi/char/newport.c linux/drivers/sgi/char/newport.c
@@ -11,13 +11,12 @@
 #include <asm/gfx.h>
 #include <asm/ng1.h>
 #include <asm/uaccess.h>
-#include <asm/newport.h>
+#include <video/newport.h>
+#include <linux/config.h>
 #include <linux/module.h>
 
 struct newport_regs *npregs;
 
-EXPORT_SYMBOL(npregs);
-
 /* Kernel routines for supporting graphics context switching */
 
 void newport_save (void *y)
@@ -26,7 +25,7 @@
 	newport_wait ();
 
 #define LOAD(val) x->val = npregs->set.val;
-#define LOADI(val) x->val = npregs->set.val.i;
+#define LOADI(val) x->val = npregs->set.val.word;
 #define LOADC(val) x->val = npregs->cset.val;
 	
 	LOAD(drawmode1);
@@ -89,7 +88,7 @@
 	newport_bfwait ();
 	LOAD (dcbmode);
 	newport_bfwait ();
-	x->dcbdata0 = npregs->set.dcbdata0.all;
+	x->dcbdata0 = npregs->set.dcbdata0.byword;
 	newport_bfwait ();
 	LOAD(dcbdata1);
 }
@@ -109,7 +108,7 @@
 {
 	newport_ctx *x = y;
 #define STORE(val) npregs->set.val = x->val
-#define STOREI(val) npregs->set.val.i = x->val
+#define STOREI(val) npregs->set.val.word = x->val
 #define STOREC(val) npregs->cset.val = x->val
 	newport_wait ();