diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/video/cgthreefb.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/video/cgthreefb.c')
| -rw-r--r-- | drivers/video/cgthreefb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/cgthreefb.c b/drivers/video/cgthreefb.c index 91611c674..e8cb95e59 100644 --- a/drivers/video/cgthreefb.c +++ b/drivers/video/cgthreefb.c @@ -1,4 +1,4 @@ -/* $Id: cgthreefb.c,v 1.4 1999/01/26 10:55:01 jj Exp $ +/* $Id: cgthreefb.c,v 1.5 1999/08/10 15:56:04 davem Exp $ * cgthreefb.c: CGthree frame buffer driver * * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) @@ -145,7 +145,7 @@ static u_char cg3_dacvals[] __initdata = { static char idstring[60] __initdata = { 0 }; -__initfunc(char *cgthreefb_init(struct fb_info_sbusfb *fb)) +char __init *cgthreefb_init(struct fb_info_sbusfb *fb) { struct fb_fix_screeninfo *fix = &fb->fix; struct display *disp = &fb->disp; |