[Linuxconsole-commit]CVS: ruby/linux/drivers/video Config.in,1.58,1.59 fbmem.c,1.59,1.60 vgacon.c,1.61,1.62

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv14110/linux/drivers/video

Modified Files:
	Config.in fbmem.c vgacon.c 
Log Message:
synced to 2.5.5

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Config.in	14 Mar 2002 20:02:07 -0000	1.58
+++ Config.in	14 Mar 2002 22:32:23 -0000	1.59
@@ -153,7 +153,7 @@
                dep_tristate '      G400 second head support' CONFIG_FB_MATROX_MAVEN $CONFIG_FB_MATROX_I2C
             fi
          fi
-         dep_tristate '     G450/G550 second head support' CONFIG_FB_MATROX_G450 $CONFIG_FB_MATROX_G100
+         dep_tristate '     G450/G550 second head support (mandatory for G550)' CONFIG_FB_MATROX_G450 $CONFIG_FB_MATROX_G100
          bool '    Multihead support' CONFIG_FB_MATROX_MULTIHEAD
       fi
       tristate '  ATI Mach64 display support (EXPERIMENTAL)' CONFIG_FB_ATY

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- fbmem.c	14 Mar 2002 20:02:07 -0000	1.59
+++ fbmem.c	14 Mar 2002 22:32:23 -0000	1.60
@@ -672,6 +672,8 @@
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 #elif defined(__sh__)
 	pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
+#elif defined(__ia64__)
+	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 #else
 #warning What do we have to do here??
 #endif

Index: vgacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vgacon.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- vgacon.c	30 Jan 2002 17:25:03 -0000	1.61
+++ vgacon.c	14 Mar 2002 22:32:23 -0000	1.62
@@ -100,14 +100,7 @@
 static u16             vga_video_port_reg;	/* Video register select port */
 static u16             vga_video_port_val;	/* Video register value port */
 static unsigned char   vga_hardscroll_enabled;
-#ifdef CONFIG_IA64_SOFTSDV_HACKS
-/*
- * SoftSDV doesn't have hardware assist VGA scrolling 
- */
-static unsigned char   vga_hardscroll_user_enable;
-#else
 static unsigned char   vga_hardscroll_user_enable = 1;
-#endif
 static int	       vga_is_gfx;
 static int	       vga_512_chars;
 static unsigned int    vga_rolled_over;