[PATCH] video console fix up

Here is the last patch for today: it enables writecombined mappings
for ia64 in fbmem.c and gets rid of an ugly ia64 simulator workaround
in vgacon.c which isn't needed anymore.

	--david

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 2fa7894752c4f5aff9d8edb1a3bd68dd31417bf0..29815d8787c35c1304686a64a99bdae97b0dcf23 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -616,6 +616,8 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
        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

diff --git a/drivers/video/vgacon.c b/drivers/video/vgacon.c
index 89a0d9e2749c2113254893cddbd1f3615ee321b1..14e2a6bfcb155f39962865b73c2182c5e7e1dee9 100644 (file)
--- a/drivers/video/vgacon.c
+++ b/drivers/video/vgacon.c
@@ -109,14 +109,7 @@ static int        vga_can_do_color = 0;    /* Do we support colors? */
 static unsigned int    vga_default_font_height;        /* Height of default screen font */
 static unsigned char   vga_video_type;         /* Card type */
 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 = 0;
-#else
 static unsigned char   vga_hardscroll_user_enable = 1;
-#endif
 static unsigned char   vga_font_is_default = 1;
 static int            vga_vesa_blanked;
 static int            vga_palette_blanked;