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/macfb.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/macfb.c')
| -rw-r--r-- | drivers/video/macfb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c index 67d6e87b1..2d0ad2924 100644 --- a/drivers/video/macfb.c +++ b/drivers/video/macfb.c @@ -22,12 +22,11 @@ #include <asm/macintosh.h> #include <linux/fb.h> - /* conditionalize these ?? */ -#include "fbcon-mfb.h" -#include "fbcon-cfb2.h" -#include "fbcon-cfb4.h" -#include "fbcon-cfb8.h" +#include <video/fbcon-mfb.h> +#include <video/fbcon-cfb2.h> +#include <video/fbcon-cfb4.h> +#include <video/fbcon-cfb8.h> #define arraysize(x) (sizeof(x)/sizeof(*(x))) @@ -237,7 +236,7 @@ static void macfb_set_disp(int con) break; #endif default: - display->dispsw = NULL; + display->dispsw = &fbcon_dummy; break; } } @@ -261,7 +260,7 @@ static int macfb_get_cmap(struct fb_cmap *cmap, int kspc, int con, if (console_loglevel < 7) return -EINVAL; if (con == currcon) /* current console? */ - return fb_get_cmap(cmap, &fb_display[con].var, kspc, 0 /*offb_getcolreg*/, info); + return fb_get_cmap(cmap, kspc, 0 /*offb_getcolreg*/, info); else if (fb_display[con].cmap.len) /* non default colormap? */ fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2); else @@ -285,7 +284,7 @@ static int macfb_set_cmap(struct fb_cmap *cmap, int kspc, int con, return err; } if (con == currcon) /* current console? */ - return fb_set_cmap(cmap, &fb_display[con].var, kspc, 1 /*offb_setcolreg*/, info); + return fb_set_cmap(cmap, kspc, 1 /*offb_setcolreg*/, info); else fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1); #endif @@ -415,6 +414,7 @@ __initfunc(void macfb_init(void)) fb_info.switch_con=&macfb_switch; fb_info.updatevar=&fb_update_var; fb_info.blank=&macfb_blank; + fb_info.flags = FBINFO_FLAG_DEFAULT; do_fb_set_var(&macfb_defined,1); macfb_get_var(&disp.var, -1, &fb_info); |