summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/cgfourteen.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
commit545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch)
treee9ce4bc598d06374bda906f18365984bf22a526a /drivers/sbus/char/cgfourteen.c
parent4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff)
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/sbus/char/cgfourteen.c')
-rw-r--r--drivers/sbus/char/cgfourteen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/cgfourteen.c b/drivers/sbus/char/cgfourteen.c
index 40fb9fd70..dbe071b98 100644
--- a/drivers/sbus/char/cgfourteen.c
+++ b/drivers/sbus/char/cgfourteen.c
@@ -1,4 +1,4 @@
-/* $Id: cgfourteen.c,v 1.24 1997/07/17 02:21:44 davem Exp $
+/* $Id: cgfourteen.c,v 1.25 1997/08/20 07:38:36 davem Exp $
* cgfourteen.c: Sun SparcStation console support.
*
* Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -456,7 +456,7 @@ __initfunc(void cg14_setup (fbinfo_t *fb, int slot, int con_node, u32 cg14, int
fb->setcurshape = cg14_setcurshape;
fb->ioctl = cg14_ioctl;
fb->switch_from_graph = cg14_switch_from_graph;
- fb->postsetup = sun_cg_postsetup;
+ fb->postsetup = cg_postsetup;
fb->reset = cg14_reset;
fb->blank = 0;
fb->unblank = 0;