diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
tree | e9ce4bc598d06374bda906f18365984bf22a526a /drivers/sbus/char/cgsix.c | |
parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/sbus/char/cgsix.c')
-rw-r--r-- | drivers/sbus/char/cgsix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/cgsix.c b/drivers/sbus/char/cgsix.c index 825d49b4a..4c24a8c0b 100644 --- a/drivers/sbus/char/cgsix.c +++ b/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 @@ cg6_reset (fbinfo_t *fb) 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 @@ __initfunc(void cg6_setup (fbinfo_t *fb, int slot, u32 cg6, int cg6_io)) 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; |