[parisc-linux-cvs] pa49, fix sticon refreshing problem

[Helge Deller]

--------------Boundary-00=_TIAMPHJM80AC3WGYF8EC
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Subject: 



--------------Boundary-00=_TIAMPHJM80AC3WGYF8EC
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="diff"

Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- Makefile	2001/06/27 20:40:50	1.80
+++ Makefile	2001/06/28 01:47:54
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -pa48
+EXTRAVERSION = -pa49
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/video/sti/sticon.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/sti/sticon.c,v
retrieving revision 1.15
diff -u -r1.15 sticon.c
--- sticon.c	2001/06/27 19:22:53	1.15
+++ sticon.c	2001/06/28 01:47:54
@@ -174,7 +174,7 @@
 {
     struct sti_struct *sti = default_sti;
 
-    if (t || b != conp->vc_rows || vga_is_gfx)
+    if (vga_is_gfx)
         return 0;
 
     sticon_cursor(conp, CM_ERASE);
@@ -339,7 +339,6 @@
     if (reverse) {
 	color = ((color >> 3) & 0x7) | ((color & 0x7) << 3);
     }
-
 
     return attr;
 }
Index: drivers/video/sti/sticore.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/sti/sticore.c,v
retrieving revision 1.18
diff -u -r1.18 sticore.c
--- sticore.c	2001/06/27 14:07:09	1.18
+++ sticore.c	2001/06/28 01:47:55
@@ -526,7 +526,7 @@
 }
 
 
-void __init 
+static void __init 
 sti_dump_rom(struct sti_rom *rom)
 {
         printk(KERN_INFO "STI %s mode ROM, id %04x-%04x, conforms to spec rev. %d.%02x\n",
@@ -689,10 +689,10 @@
 
 	address = (unsigned long) STI_PTR(raw);
 
-	sti->font_unpmv = address+(raw->font_unpmv & 0x03ffffff);
-	sti->block_move = address+(raw->block_move & 0x03ffffff);
-	sti->init_graph = address+(raw->init_graph & 0x03ffffff);
-	sti->inq_conf = address+(raw->inq_conf     & 0x03ffffff);
+	sti->font_unpmv = address + (raw->font_unpmv & 0x03ffffff);
+	sti->block_move = address + (raw->block_move & 0x03ffffff);
+	sti->init_graph = address + (raw->init_graph & 0x03ffffff);
+	sti->inq_conf   = address + (raw->inq_conf   & 0x03ffffff);
 
 	sti->rom = cooked;
 	sti->rom->raw = raw;
Index: drivers/video/sti/sticore.h
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/sti/sticore.h,v
retrieving revision 1.16
diff -u -r1.16 sticore.h
--- sticore.h	2001/06/27 14:07:09	1.16
+++ sticore.h	2001/06/28 01:47:56
@@ -59,7 +59,7 @@
                pdc_sti_call( func, (unsigned long)STI_PTR(flags), \
                                    (unsigned long)STI_PTR(inptr), \
                                    (unsigned long)STI_PTR(outptr), \
-                                   (unsigned long)glob_cfg); \
+                                   (unsigned long)(glob_cfg)); \
        })
 
 #endif /* USE_HPPA_IOREMAP */

--------------Boundary-00=_TIAMPHJM80AC3WGYF8EC--