patch-2.1.53 linux/drivers/sbus/char/cgsix.c

• Lines: 26
• Date: Thu Sep 4 12:54:48 1997
• Orig file: v2.1.52/linux/drivers/sbus/char/cgsix.c
• Orig date: Thu Jul 17 10:06:05 1997

diff -u --recursive --new-file v2.1.52/linux/drivers/sbus/char/cgsix.c linux/drivers/sbus/char/cgsix.c
@@ -1,4 +1,4 @@
-/* $Id: cgsix.c,v 1.35 1997/07/17 02:21:45 davem Exp $
+/* $Id: cgsix.c,v 1.37 1997/08/22 15:55:20 jj Exp $
  * cgsix.c: cgsix frame buffer driver
  *
  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -409,8 +409,8 @@
 	struct cg6_info *cg6 = &(fb->info.cg6);
 	unsigned int rev, conf;
 
-	if (fb->setcursor)
-		sun_hw_hide_cursor ();
+	if (fb == &fbinfo[0])
+		sbus_hw_hide_cursor ();
 	/* Turn off stuff in the Transform Engine. */
 	cg6->tec->tec_matrix = 0;
 	cg6->tec->tec_clip = 0;
@@ -466,7 +466,7 @@
 	fb->setcursor = cg6_setcursor;
 	fb->setcursormap = cg6_setcursormap;
 	fb->setcurshape = cg6_setcurshape;
-	fb->postsetup = sun_cg_postsetup;
+	fb->postsetup = cg_postsetup;
 	fb->blitc = cg6_blitc;
 	fb->setw = cg6_setw;
 	fb->cpyw = cg6_cpyw;