patch-2.4.0-test7 linux/drivers/video/matrox/matroxfb_base.h

Next file: linux/drivers/video/matrox/matroxfb_misc.c
Previous file: linux/drivers/video/matrox/matroxfb_base.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/video/matrox/matroxfb_base.h linux/drivers/video/matrox/matroxfb_base.h
@@ -2,7 +2,7 @@
  *
  * Hardware accelerated Matrox Millennium I, II, Mystique, G100, G200 and G400
  *
- * (c) 1998,1999 Petr Vandrovec <vandrove@vc.cvut.cz>
+ * (c) 1998,1999,2000 Petr Vandrovec <vandrove@vc.cvut.cz>
  *
  */
 #ifndef __MATROXFB_H__
@@ -530,6 +530,7 @@
 		unsigned int	textvram;	/* character cells */
 		unsigned int	ydstorg;	/* offset in bytes from video start to usable memory */
 						/* 0 except for 6MB Millenium */
+		int		memtype;
 			      } devflags;
 	struct display_switch	dispsw;
 	struct {
@@ -695,6 +696,7 @@
 #define M_VCOUNT	0x1E20
 
 #define M_RESET		0x1E40
+#define M_MEMRDBK	0x1E44
 
 #define M_AGP2PLL	0x1E4C
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)