diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/video/cgthreefb.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/video/cgthreefb.c')
| -rw-r--r-- | drivers/video/cgthreefb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/cgthreefb.c b/drivers/video/cgthreefb.c index 2cab0fc25..882669d8f 100644 --- a/drivers/video/cgthreefb.c +++ b/drivers/video/cgthreefb.c @@ -1,4 +1,4 @@ -/* $Id: cgthreefb.c,v 1.1 1998/07/21 14:50:47 jj Exp $ +/* $Id: cgthreefb.c,v 1.3 1998/09/04 15:43:43 jj Exp $ * cgthreefb.c: CGthree frame buffer driver * * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) @@ -21,10 +21,10 @@ #include <linux/init.h> #include <linux/selection.h> -#include "sbusfb.h" +#include <video/sbusfb.h> #include <asm/io.h> -#include "fbcon-cfb8.h" +#include <video/fbcon-cfb8.h> /* Control Register Constants */ #define CG3_CR_ENABLE_INTS 0x80 @@ -85,7 +85,7 @@ static struct sbus_mmap_map cg3_mmap_map[] = { #define D4M3(x) ((((x)>>2)<<1) + ((x)>>2)) /* (x/4)*3 */ #define D4M4(x) ((x)&~0x3) /* (x/4)*4 */ -static void cg3_loadcmap (struct fb_info_sbusfb *fb, int index, int count) +static void cg3_loadcmap (struct fb_info_sbusfb *fb, struct display *p, int index, int count) { struct bt_regs *bt = &fb->s.cg3.regs->cmap; u32 *i; |