diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/char/console.c linux-mips-cvs/drivers/char/console.c
--- linux-mips-cvs-meeting/drivers/char/console.c	2002-10-03 22:53:35.000000000 +0200
+++ linux-mips-cvs/drivers/char/console.c	2002-10-03 23:18:17.000000000 +0200
@@ -1046,7 +1046,8 @@
 	underline = 0;
 	reverse = 0;
 	blink = 0;
-	color = def_color;
+	if (can_do_color)
+		color = def_color;
 }
 
 /* console_sem is held */
@@ -1119,7 +1120,8 @@
 				  * with white underscore (Linux - use
 				  * default foreground).
 				  */
-				color = (def_color & 0x0f) | background;
+			        if (can_do_color)
+					color = (def_color & 0x0f) | background;
 				underline = 1;
 				break;
 			case 39: /* ANSI X3.64-1979 (SCO-ish?)
@@ -1127,11 +1129,13 @@
 				  * Reset colour to default? It did this
 				  * before...
 				  */
-				color = (def_color & 0x0f) | background;
+			        if (can_do_color)
+					color = (def_color & 0x0f) | background;
 				underline = 0;
 				break;
 			case 49:
-				color = (def_color & 0xf0) | foreground;
+			  	if (can_do_color)
+					color = (def_color & 0xf0) | foreground;
 				break;
 			default:
 				if (par[i] >= 30 && par[i] <= 37)
@@ -1274,9 +1278,11 @@
 			}
 			break;
 		case 8:	/* store colors as defaults */
-			def_color = attr;
-			if (hi_font_mask == 0x100)
-				def_color >>= 1;
+			if (can_do_color) {
+				def_color = attr;
+				if (hi_font_mask == 0x100)
+					def_color >>= 1;
+			}
 			default_attr(currcons);
 			update_attr(currcons);
 			break;
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/Config.in linux-mips-cvs/drivers/video/Config.in
--- linux-mips-cvs-meeting/drivers/video/Config.in	2002-10-03 22:53:35.000000000 +0200
+++ linux-mips-cvs/drivers/video/Config.in	2002-10-01 17:45:29.000000000 +0200
@@ -211,6 +211,7 @@
       tristate '  HD64461 Frame Buffer support' CONFIG_FB_HIT
    fi
    if [ "$CONFIG_DECSTATION" = "y" ]; then
+      dep_bool '  PMAG-AA TURBOchannel framebuffer support' CONFIG_FB_PMAG_AA $CONFIG_TC
       dep_bool '  PMAG-BA TURBOchannel framebuffer support' CONFIG_FB_PMAG_BA $CONFIG_TC
       dep_bool '  PMAGB-B TURBOchannel framebuffer support' CONFIG_FB_PMAGB_B $CONFIG_TC
       dep_bool '  Maxine (Personal DECstation) onboard framebuffer support' CONFIG_FB_MAXINE
@@ -225,6 +226,7 @@
    bool '  Advanced low level driver options' CONFIG_FBCON_ADVANCED
    if [ "$CONFIG_FBCON_ADVANCED" = "y" ]; then
       tristate '    Monochrome support' CONFIG_FBCON_MFB
+      tristate '    8 bpp monochrome support' CONFIG_FBCON_MFB8
       tristate '    2 bpp packed pixels support' CONFIG_FBCON_CFB2
       tristate '    4 bpp packed pixels support' CONFIG_FBCON_CFB4
       tristate '    8 bpp packed pixels support' CONFIG_FBCON_CFB8
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/Makefile linux-mips-cvs/drivers/video/Makefile
--- linux-mips-cvs-meeting/drivers/video/Makefile	2002-10-03 22:53:35.000000000 +0200
+++ linux-mips-cvs/drivers/video/Makefile	2002-10-01 17:45:55.000000000 +0200
@@ -14,7 +14,7 @@
 		  fbcon-vga.o fbcon-iplan2p2.o fbcon-iplan2p4.o \
 		  fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \
 		  fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \
-		  fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o \
+		  fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o fbcon-mfb8.o \
 		  cyber2000fb.o sa1100fb.o fbcon-hga.o fbgen.o
 
 # Each configuration option enables a list of files.
@@ -81,6 +81,7 @@
 obj-$(CONFIG_FB_CGFOURTEEN)       += cgfourteenfb.o sbusfb.o
 obj-$(CONFIG_FB_P9100)            += p9100fb.o sbusfb.o
 obj-$(CONFIG_FB_LEO)              += leofb.o sbusfb.o
+obj-$(CONFIG_FB_PMAG_AA)          += pmag-aa-fb.o
 obj-$(CONFIG_FB_PMAG_BA)          += pmag-ba-fb.o
 obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
@@ -143,6 +144,7 @@
 obj-$(CONFIG_FBCON_IPLAN2P16)     += fbcon-iplan2p16.o
 obj-$(CONFIG_FBCON_MAC)           += fbcon-mac.o
 obj-$(CONFIG_FBCON_MFB)           += fbcon-mfb.o
+obj-$(CONFIG_FBCON_MFB8)          += fbcon-mfb8.o
 obj-$(CONFIG_FBCON_VGA)           += fbcon-vga.o
 obj-$(CONFIG_FBCON_HGA)           += fbcon-hga.o
 obj-$(CONFIG_FBCON_STI)           += fbcon-sti.o
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/dummycon.c linux-mips-cvs/drivers/video/dummycon.c
--- linux-mips-cvs-meeting/drivers/video/dummycon.c	2001-01-10 06:27:34.000000000 +0100
+++ linux-mips-cvs/drivers/video/dummycon.c	2002-10-03 19:07:09.000000000 +0200
@@ -35,7 +35,13 @@
 
 static void dummycon_init(struct vc_data *conp, int init)
 {
+#if !defined(CONFIG_FBCON_MFB) && !defined(CONFIG_FBCON_MFB8) && \
+    !defined(CONFIG_FBCON_ILBM) && !defined(CONFIG_FBCON_HGA) && \
+    !defined(CONFIG_FBCON_AFB)
     conp->vc_can_do_color = 1;
+#else
+    conp->vc_can_do_color = 0;
+#endif
     if (init) {
 	conp->vc_cols = DUMMY_COLUMNS;
 	conp->vc_rows = DUMMY_ROWS;
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/fbcon-mfb8.c linux-mips-cvs/drivers/video/fbcon-mfb8.c
--- linux-mips-cvs-meeting/drivers/video/fbcon-mfb8.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-mips-cvs/drivers/video/fbcon-mfb8.c	2002-10-03 23:23:32.000000000 +0200
@@ -0,0 +1,246 @@
+/*
+ *  linux/drivers/video/mfb8.c -- Low level frame buffer operations for
+ *				  8 bit monochrome
+ *
+ *	Created 28 September 2002 by Martin Schulze
+ *	Based on mfb.c and cfb8.c by Geert Uytterhoeven
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License.  See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/console.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+
+#include <video/fbcon.h>
+#include <video/fbcon-mfb8.h>
+
+
+    /*
+     *  Monochrome
+     */
+
+void fbcon_mfb8_setup(struct display *p)
+{
+    if (p->line_length)
+	p->next_line = p->line_length;
+    else
+	p->next_line = p->var.xres_virtual;
+    p->next_plane = 0;
+}
+
+void fbcon_mfb8_bmove(struct display *p, int sy, int sx, int dy, int dx,
+		     int height, int width)
+{
+    int bytes = p->next_line, linesize = bytes * fontheight(p), rows;
+    u8 *src,*dst;
+
+    if (sx == 0 && dx == 0 && width * fontwidth(p) == bytes) {
+	fb_memmove(p->screen_base + dy * linesize,
+		  p->screen_base + sy * linesize,
+		  height * linesize);
+	return;
+    }
+    if (fontwidthlog(p)) {
+    	sx <<= fontwidthlog(p); dx <<= fontwidthlog(p); width <<= fontwidthlog(p);
+    } else {
+    	sx *= fontwidth(p); dx *= fontwidth(p); width *= fontwidth(p);
+    }
+    if (dy < sy || (dy == sy && dx < sx)) {
+	src = p->screen_base + sy * linesize + sx;
+	dst = p->screen_base + dy * linesize + dx;
+	for (rows = height * fontheight(p) ; rows-- ;) {
+	    fb_memmove(dst, src, width);
+	    src += bytes;
+	    dst += bytes;
+	}
+    } else {
+	src = p->screen_base + (sy+height) * linesize + sx - bytes;
+	dst = p->screen_base + (dy+height) * linesize + dx - bytes;
+	for (rows = height * fontheight(p) ; rows-- ;) {
+	    fb_memmove(dst, src, width);
+	    src -= bytes;
+	    dst -= bytes;
+	}
+    }
+}
+
+void fbcon_mfb8_clear(struct vc_data *conp, struct display *p, int sy, int sx,
+		     int height, int width)
+{
+    u8 *dest;
+    u_int rows;
+    int inverse = conp ? attr_reverse(p,conp->vc_video_erase_char) : 0;
+
+    dest = p->screen_base+sy*fontheight(p)*p->next_line+sx*fontwidth(p);
+
+    if (sx == 0 && width*fontwidth(p)*p->var.bits_per_pixel == p->next_line) {
+	if (inverse)
+	    fb_memset255(dest, height*fontheight(p)*width*fontwidth(p));
+	else
+	    fb_memclear(dest, height*fontheight(p)*width*fontwidth(p));
+    } else
+	for (rows = height*fontheight(p); rows--; dest += p->next_line)
+	    if (inverse)
+		fb_memset255(dest, width*fontwidth(p));
+	    else
+		fb_memclear_small(dest, width*fontwidth(p));
+}
+
+void fbcon_mfb8_putc(struct vc_data *conp, struct display *p, int c, int yy,
+		    int xx)
+{
+    u8 *dest, *cdat;
+    u_int rows, bold, revs, underl;
+    u8 d;
+
+    dest = p->screen_base+yy*fontheight(p)*p->next_line+(xx*fontwidth(p));
+    cdat = p->fontdata+(c&p->charmask)*fontheight(p);
+    bold = attr_bold(p,c);
+    revs = attr_reverse(p,c);
+    underl = attr_underline(p,c);
+
+    for (rows = fontheight(p); rows--; dest += p->next_line) {
+	d = *cdat++;
+	if (underl && !rows)
+	    d = 0xff;
+	else if (bold)
+	    d |= d>>1;
+	if (revs)
+	    d = ~d;
+
+    	fb_writeb (d>>0 & 1, dest+7);
+    	fb_writeb (d>>1 & 1, dest+6);
+    	fb_writeb (d>>2 & 1, dest+5);
+    	fb_writeb (d>>3 & 1, dest+4);
+    	fb_writeb (d>>4 & 1, dest+3);
+    	fb_writeb (d>>5 & 1, dest+2);
+    	fb_writeb (d>>6 & 1, dest+1);
+    	fb_writeb (d>>7 & 1, dest+0);
+    }
+}
+
+void fbcon_mfb8_putcs(struct vc_data *conp, struct display *p, 
+		     const unsigned short *s, int count, int yy, int xx)
+{
+    u8 *dest, *dest0, *cdat;
+    u_int rows, bold, revs, underl;
+    u8 d;
+    u16 c;
+
+    dest0 = p->screen_base+yy*fontheight(p)*p->next_line+(xx*fontwidth(p));
+    c = scr_readw(s);
+    bold = attr_bold(p, c);
+    revs = attr_reverse(p, c);
+    underl = attr_underline(p, c);
+
+    while (count--) {
+	c = scr_readw(s++) & p->charmask;
+
+	dest = dest0;
+	dest0 = dest0 + p->var.bits_per_pixel;
+	cdat = p->fontdata+c*fontheight(p);
+
+	for (rows = fontheight(p); rows--; dest += p->next_line) {
+	    d = *cdat++;
+
+	    if (underl && !rows)
+		d = 0xff;
+	    else if (bold)
+		d |= d>>1;
+	    if (revs)
+		d = ~d;
+
+	    fb_writeb (d>>0 & 1, dest+7);
+	    fb_writeb (d>>1 & 1, dest+6);
+	    fb_writeb (d>>2 & 1, dest+5);
+	    fb_writeb (d>>3 & 1, dest+4);
+	    fb_writeb (d>>4 & 1, dest+3);
+	    fb_writeb (d>>5 & 1, dest+2);
+	    fb_writeb (d>>6 & 1, dest+1);
+	    fb_writeb (d>>7 & 1, dest+0);
+	}
+    }
+}
+
+void fbcon_mfb8_revc(struct display *p, int xx, int yy)
+{
+    u8 *dest;
+    u_int rows;
+    u_int bit;
+
+    dest = p->screen_base+yy*fontheight(p)*p->next_line+xx*fontwidth(p);
+    for (rows = fontheight(p); rows--; dest += p->next_line) {
+        for (bit = 0; bit < p->var.bits_per_pixel; bit++)
+	    fb_writeb (~fb_readb(dest+bit), dest+bit);
+    }
+}
+
+void fbcon_mfb8_clear_margins(struct vc_data *conp, struct display *p,
+			     int bottom_only)
+{
+    u8 *dest;
+    int height, bottom;
+    int inverse = conp ? attr_reverse(p,conp->vc_video_erase_char) : 0;
+
+    /* XXX Need to handle right margin? */
+
+    height = p->var.yres - conp->vc_rows * fontheight(p);
+    if (!height)
+	return;
+    bottom = conp->vc_rows + p->yscroll;
+    if (bottom >= p->vrows)
+	bottom -= p->vrows;
+    dest = p->screen_base + bottom * fontheight(p) * p->next_line;
+    if (inverse)
+	fb_memset255(dest, height * p->next_line);
+    else
+	fb_memclear(dest, height * p->next_line);
+}
+
+
+    /*
+     *  `switch' for the low level operations
+     */
+
+struct display_switch fbcon_mfb8 = {
+    setup:		fbcon_mfb8_setup,
+    bmove:		fbcon_mfb8_bmove,
+    clear:		fbcon_mfb8_clear,
+    putc:		fbcon_mfb8_putc,
+    putcs:		fbcon_mfb8_putcs,
+    revc:		fbcon_mfb8_revc,
+    clear_margins:	fbcon_mfb8_clear_margins,
+    fontwidthmask:	FONTWIDTH(8)
+};
+
+
+#ifdef MODULE
+MODULE_LICENSE("GPL");
+
+int init_module(void)
+{
+    return 0;
+}
+
+void cleanup_module(void)
+{}
+#endif /* MODULE */
+
+
+    /*
+     *  Visible symbols for modules
+     */
+
+EXPORT_SYMBOL(fbcon_mfb8);
+EXPORT_SYMBOL(fbcon_mfb8_setup);
+EXPORT_SYMBOL(fbcon_mfb8_bmove);
+EXPORT_SYMBOL(fbcon_mfb8_clear);
+EXPORT_SYMBOL(fbcon_mfb8_putc);
+EXPORT_SYMBOL(fbcon_mfb8_putcs);
+EXPORT_SYMBOL(fbcon_mfb8_revc);
+EXPORT_SYMBOL(fbcon_mfb8_clear_margins);
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/fbcon.c linux-mips-cvs/drivers/video/fbcon.c
--- linux-mips-cvs-meeting/drivers/video/fbcon.c	2002-10-03 23:25:18.000000000 +0200
+++ linux-mips-cvs/drivers/video/fbcon.c	2002-10-03 19:31:00.000000000 +0200
@@ -43,7 +43,7 @@
  *    o cfb{2,4,8,16,24,32}	Packed pixels
  *    o ilbm			Amiga interleaved bitplanes
  *    o iplan2p[248]		Atari interleaved bitplanes
- *    o mfb			Monochrome
+ *    o mfb,mfb8		Monochrome
  *    o vga			VGA characters/attributes
  *
  *  To do:
@@ -711,7 +711,8 @@
     if ((p->var.yres % fontheight(p)) &&
 	(p->var.yres_virtual % fontheight(p) < p->var.yres % fontheight(p)))
 	p->vrows--;
-    conp->vc_can_do_color = p->var.bits_per_pixel != 1;
+    conp->vc_can_do_color = (p->fb_info->fix.visual != FB_VISUAL_MONO10 &&
+			     p->fb_info->fix.visual != FB_VISUAL_MONO01);
     conp->vc_complement_mask = conp->vc_can_do_color ? 0x7700 : 0x0800;
     if (charcnt == 256) {
     	conp->vc_hi_font_mask = 0;
@@ -2177,7 +2178,12 @@
 					   p->fb_info);
 	}
 	
-    if (depth >= 8) {
+    if (p->visual == FB_VISUAL_MONO10 ||
+	p->visual == FB_VISUAL_MONO01) {
+	logo = linux_logo_bw;
+	logo_depth = 1;
+    }
+    else if (depth >= 8) {
 	logo = linux_logo;
 	logo_depth = 8;
     }
@@ -2422,6 +2428,35 @@
 	    done = 1;
 	}
 #endif
+#if defined(CONFIG_FBCON_MFB8)
+	if (depth == 8 && (p->type == FB_TYPE_PACKED_PIXELS ||
+			   p->type == FB_TYPE_PLANES ||
+			   p->type == FB_TYPE_INTERLEAVED_PLANES)) {
+
+	    /* monochrome */
+	    unsigned char inverse = p->inverse || p->visual == FB_VISUAL_MONO01
+		? 0x00 : 0xff;
+	    u8 d;
+
+	    /* can't use simply memcpy because need to apply inverse */
+	    for( y1 = 0; y1 < LOGO_H; y1++ ) {
+		src = logo + y1*LOGO_LINE;
+		dst = fb + y1*line + x*8;
+		for( x1 = 0; x1 < LOGO_LINE; x1++ ) {
+		    d = *src++ ^ inverse;
+		    fb_writeb (d>>7 & 1, dst++);
+		    fb_writeb (d>>6 & 1, dst++);
+		    fb_writeb (d>>5 & 1, dst++);
+		    fb_writeb (d>>4 & 1, dst++);
+		    fb_writeb (d>>3 & 1, dst++);
+		    fb_writeb (d>>2 & 1, dst++);
+		    fb_writeb (d>>1 & 1, dst++);
+		    fb_writeb (d>>0 & 1, dst++);
+		}
+	    }
+	    done = 1;
+	}
+#endif
 #if defined(CONFIG_FBCON_VGA_PLANES)
 	if (depth == 4 && p->type == FB_TYPE_VGA_PLANES) {
 		outb_p(1,0x3ce); outb_p(0xf,0x3cf);
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/fbmem.c linux-mips-cvs/drivers/video/fbmem.c
--- linux-mips-cvs-meeting/drivers/video/fbmem.c	2002-10-03 22:53:35.000000000 +0200
+++ linux-mips-cvs/drivers/video/fbmem.c	2002-10-01 17:47:21.000000000 +0200
@@ -124,6 +124,7 @@
 extern int sisfb_setup(char*);
 extern int stifb_init(void);
 extern int stifb_setup(char*);
+extern int pmagaafb_init(void);
 extern int pmagbafb_init(void);
 extern int pmagbbfb_init(void);
 extern void maxinefb_init(void);
@@ -303,6 +304,9 @@
 #ifdef CONFIG_FB_PVR2
 	{ "pvr2", pvr2fb_init, pvr2fb_setup },
 #endif
+#ifdef CONFIG_FB_PMAG_AA
+	{ "pmagaafb", pmagaafb_init, NULL },
+#endif
 #ifdef CONFIG_FB_PMAG_BA
 	{ "pmagbafb", pmagbafb_init, NULL },
 #endif
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/pmag-aa-fb.c linux-mips-cvs/drivers/video/pmag-aa-fb.c
--- linux-mips-cvs-meeting/drivers/video/pmag-aa-fb.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-mips-cvs/drivers/video/pmag-aa-fb.c	2002-10-03 17:20:58.000000000 +0200
@@ -0,0 +1,387 @@
+/*
+ *	linux/drivers/video/pmag-aa-fb.c
+ *	Copyright 2002 Karsten Merker <merker@debian.org>
+ *
+ *	PMAG-AA TurboChannel framebuffer card support ... derived from
+ *	pmag-ba-fb.c, which is Copyright (C) 1999, 2000, 2001 by
+ *	Michael Engel <engel@unix-ag.org>, Karsten Merker <merker@debian.org>
+ *	and Harald Koerfgen <hkoerfg@web.de>, which itself is derived from
+ *	"HP300 Topcat framebuffer support (derived from macfb of all things)
+ *	Phil Blundell <philb@gnu.org> 1998"
+ *
+ *	This file is subject to the terms and conditions of the GNU General
+ *	Public License.  See the file COPYING in the main directory of this
+ *	archive for more details.
+ *
+ *	Version 0.01 2002/09/28 first try to get a PMAG-AA running
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/fb.h>
+#include <asm/bootinfo.h>
+#include <asm/dec/machtype.h>
+#include <asm/dec/tc.h>
+#include "pmag-aa-fb.h"
+
+#include <video/fbcon.h>
+#include <video/fbcon-mfb8.h>
+#include <video/fbcon-cfb2.h>
+#include <video/fbcon-cfb4.h>
+#include <video/fbcon-cfb8.h>
+
+#define arraysize(x)    (sizeof(x)/sizeof(*(x)))
+
+struct pmag_aa_bt455_regs {
+        volatile unsigned char addr_cmap;
+        char            pad0[3];
+        volatile unsigned char addr_cmap_data;
+        char            pad1[3];
+        volatile unsigned char addr_clr;
+        char            pad2[3];
+        volatile unsigned char addr_ovly;
+        char            pad3[3];
+};
+
+typedef struct {
+        volatile unsigned short addr_lo;
+        short                   pad0;
+        volatile unsigned short addr_hi;
+        short                   pad1;
+        volatile unsigned short addr_cmap;
+        short                   pad2;
+        volatile unsigned short addr_reg;
+        short                   pad3;
+} pmag_aa_bt431_regs;
+
+
+struct pmag_aa_my_fb_info {
+	struct fb_info info;
+	struct pmag_aa_bt455_regs *bt455_regs;
+	struct pmag_aa_bt431_regs *bt431_regs;
+	unsigned long pmagaa_fb_start;
+	unsigned long pmagaa_fb_size;
+	unsigned long pmagaa_fb_line_length;
+};
+
+static struct display disp;
+/*
+ * Max 3 TURBOchannel slots -> max 3 PMAG-AA
+ */
+static struct pmag_aa_my_fb_info pmagaa_fb_info[3];
+
+static struct fb_var_screeninfo pmagaafb_defined = {
+        xres:           1280,           /* visible X resolution */
+        yres:           1024,           /* visibly Y resolution */
+        xres_virtual:   2048,           /* virtual X resolution, a framebuffer line is 2048
+                                           bytes wide, although the chip displays only the
+                                           first 1280 */
+        yres_virtual:   1024,
+        xoffset:        0,              /* offset of the visible window in the virtual area */
+        yoffset:        0,              /* offset of the visible window in the virtual area */
+        bits_per_pixel: 8,              /* PMAG-AA is monochrome, but uses in fact 8 Bits */
+        grayscale:      0,              /* per pixel of which only the LSB is used */
+        accel_flags:    FB_ACCEL_NONE,
+        activate:       FB_ACTIVATE_NOW,
+        height:         195,            /* screen size in mm, used for dpi calculation */
+        width:          274,
+        vmode:          FB_VMODE_NONINTERLACED
+};
+
+struct pmagaafb_par {
+};
+
+static int currcon = 0;
+static struct pmagaafb_par current_par;
+
+static void pmagaafb_encode_var(struct fb_var_screeninfo *var,
+				struct pmagaafb_par *par)
+{
+	int i = 0;
+	var->xres = 1280;
+	var->yres = 1024;
+	var->xres_virtual = 2048;
+	var->yres_virtual = 1024;
+	var->xoffset = 0;
+	var->yoffset = 0;
+	var->bits_per_pixel = 8;
+	var->grayscale = 1;
+	var->transp.offset = 0;
+	var->transp.length = 0;
+	var->transp.msb_right = 0;
+	var->nonstd = 0;
+	var->activate = FB_ACTIVATE_NOW;
+	var->height = -1;
+	var->width = -1;
+	var->vmode = FB_VMODE_NONINTERLACED;
+	var->pixclock = 0;
+	var->sync = 0;
+	var->left_margin = 0;
+	var->right_margin = 0;
+	var->upper_margin = 0;
+	var->lower_margin = 0;
+	var->hsync_len = 0;
+	var->vsync_len = 0;
+	for (i = 0; i < arraysize(var->reserved); i++)
+		var->reserved[i] = 0;
+}
+
+static void pmagaafb_get_par(struct pmagaafb_par *par)
+{
+	*par = current_par;
+}
+
+static int pmagaa_fb_update_var(int con, struct fb_info *info)
+{
+	return 0;
+}
+
+static int pmagaa_do_fb_set_var(struct fb_var_screeninfo *var,
+				int isactive)
+{
+	struct pmagaafb_par par;
+
+	pmagaafb_get_par(&par);
+	pmagaafb_encode_var(var, &par);
+	return 0;
+}
+
+/*
+ * Turn hardware cursor off
+ */
+void pmagaafb_erase_cursor(struct pmag_aa_my_fb_info *info)
+{
+	/* Not yet implemented */
+}
+
+/*
+ * Get the palette
+ */
+
+static int pmagaafb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
+			     struct fb_info *info)
+{
+	/* Not yet implemented */
+	return 0;
+}
+
+/*
+ * Set the palette. 
+ */
+static int pmagaafb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
+			     struct fb_info *info)
+{
+	/* Not yet implemented */
+	return 0;
+}
+
+static int pmagaafb_get_var(struct fb_var_screeninfo *var, int con,
+			    struct fb_info *info)
+{
+	struct pmagaafb_par par;
+	if (con == -1) {
+		pmagaafb_get_par(&par);
+		pmagaafb_encode_var(var, &par);
+	} else
+		*var = fb_display[con].var;
+	return 0;
+}
+
+
+static int pmagaafb_set_var(struct fb_var_screeninfo *var, int con,
+			    struct fb_info *info)
+{
+	int err;
+
+	if ((err = pmagaa_do_fb_set_var(var, 1)))
+		return err;
+	return 0;
+}
+
+static void pmagaafb_encode_fix(struct fb_fix_screeninfo *fix,
+				struct pmagaafb_par *par,
+				struct pmag_aa_my_fb_info *info)
+{
+	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+	strcpy(fix->id, "PMAG-AA");
+
+	fix->smem_start = info->pmagaa_fb_start;
+	fix->smem_len = info->pmagaa_fb_size;
+	fix->type = FB_TYPE_PACKED_PIXELS;
+	/* fix->visual = FB_VISUAL_PSEUDOCOLOR; */
+	fix->visual = FB_VISUAL_MONO10;
+	fix->xpanstep = 0;
+	fix->ypanstep = 0;
+	fix->ywrapstep = 0;
+	fix->line_length = info->pmagaa_fb_line_length;
+}
+
+static int pmagaafb_get_fix(struct fb_fix_screeninfo *fix, int con,
+			    struct fb_info *info)
+{
+	struct pmagaafb_par par;
+
+	pmagaafb_get_par(&par);
+	pmagaafb_encode_fix(fix, &par, (struct pmag_aa_my_fb_info *) info);
+
+	return 0;
+}
+
+
+static int pmagaafb_ioctl(struct inode *inode, struct file *file,
+			  unsigned int cmd, unsigned long arg, int con,
+			  struct fb_info *info)
+{
+	return -EINVAL;
+}
+
+static int pmagaafb_switch(int con, struct fb_info *info)
+{
+	pmagaa_do_fb_set_var(&fb_display[con].var, 1);
+	currcon = con;
+
+	return 0;
+}
+
+/* 0 unblank, 1 blank, 2 no vsync, 3 no hsync, 4 off */
+
+static void pmagaafb_blank(int blank, struct fb_info *info)
+{
+	/* Not supported */
+}
+
+static int pmagaafb_open(struct fb_info *info, int user)
+{
+	/*
+	 * Nothing, only a usage count for the moment
+	 */
+	MOD_INC_USE_COUNT;
+	return (0);
+}
+
+static void pmagaafb_set_disp(int con, struct pmag_aa_my_fb_info *info)
+{
+	struct fb_fix_screeninfo fix;
+	struct display *display;
+
+	if (con >= 0)
+		display = &fb_display[con];
+	else
+		display = &disp;	/* used during initialization */
+
+	pmagaafb_get_fix(&fix, con, (struct fb_info *) info);
+
+	display->screen_base = (char *) fix.smem_start;
+	display->visual = fix.visual;
+	display->type = fix.type;
+	display->type_aux = fix.type_aux;
+	display->ypanstep = fix.ypanstep;
+	display->ywrapstep = fix.ywrapstep;
+	display->line_length = fix.line_length;
+	display->next_line = fix.line_length;
+	display->can_soft_blank = 0;
+	display->inverse = 0;
+	display->scrollmode = SCROLL_YREDRAW;
+	/* display->dispsw = &fbcon_cfb8; */
+	display->dispsw = &fbcon_mfb8;
+}
+
+static int pmagaafb_release(struct fb_info *info, int user)
+{
+	MOD_DEC_USE_COUNT;
+	return (0);
+}
+
+static struct fb_ops pmagaafb_ops = {
+	owner:THIS_MODULE,
+	fb_open:pmagaafb_open,
+	fb_release:pmagaafb_release,
+	fb_get_fix:pmagaafb_get_fix,
+	fb_get_var:pmagaafb_get_var,
+	fb_set_var:pmagaafb_set_var,
+	fb_get_cmap:pmagaafb_get_cmap,
+	fb_set_cmap:pmagaafb_set_cmap,
+	fb_ioctl:pmagaafb_ioctl,
+	fb_mmap:0,
+	fb_rasterimg:0
+};
+
+int __init pmagaafb_init_one(int slot)
+{
+	unsigned long base_addr = get_tc_base_addr(slot);
+	struct pmag_aa_my_fb_info *ip =
+	    (struct pmag_aa_my_fb_info *) &pmagaa_fb_info[slot];
+
+	printk("PMAG-AA framebuffer in slot %d\n", slot);
+
+	/*
+	 * Framebuffer display memory base address and friends
+	 */
+	ip->bt455_regs =
+	    (struct pmag_aa_bt455_regs *) (base_addr +
+					    PMAG_AA_BT455_OFFSET);
+	ip->bt431_regs =
+	    (struct pmag_aa_bt431_regs *) (base_addr +
+					    PMAG_AA_BT431_OFFSET);
+
+	ip->pmagaa_fb_start = base_addr + PMAG_AA_ONBOARD_FBMEM_OFFSET;
+	ip->pmagaa_fb_size = 2048 * 1024; /* fb_fix_screeninfo.smem_length 
+				        	seems to be physical */
+	ip->pmagaa_fb_line_length = 2048;
+
+	/*
+	 *      Let there be consoles..
+	 */
+	strcpy(ip->info.modename, "PMAG-AA");
+	ip->info.changevar = NULL;
+	ip->info.node = -1;
+	ip->info.fbops = &pmagaafb_ops;
+	ip->info.disp = &disp;
+	ip->info.switch_con = &pmagaafb_switch;
+	ip->info.updatevar = &pmagaa_fb_update_var;
+	ip->info.blank = &pmagaafb_blank;
+	ip->info.flags = FBINFO_FLAG_DEFAULT;
+
+	pmagaa_do_fb_set_var(&pmagaafb_defined, 1);
+	pmagaafb_get_var(&disp.var, -1, (struct fb_info *) ip);
+	pmagaafb_set_disp(-1, ip);
+
+	/* Clear the screen since the vram is not as volatile as expected */
+	memset ((void *)ip->pmagaa_fb_start, 0, ip->pmagaa_fb_size);
+
+	if (register_framebuffer((struct fb_info *) ip) < 0)
+		return 1;
+
+	return 0;
+}
+
+/* 
+ * Initialise the framebuffer
+ */
+
+int __init pmagaafb_init(void)
+{
+	int sid;
+	int found = 0;
+
+	if (TURBOCHANNEL) {
+		while ((sid = search_tc_card("PMAG-AA")) >= 0) {
+			found = 1;
+			claim_tc_card(sid);
+			pmagaafb_init_one(sid);
+		}
+		return found ? 0 : -ENODEV;
+	} else {
+		return -ENODEV;
+	}
+}
+
+MODULE_LICENSE("GPL");
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/drivers/video/pmag-aa-fb.h linux-mips-cvs/drivers/video/pmag-aa-fb.h
--- linux-mips-cvs-meeting/drivers/video/pmag-aa-fb.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-mips-cvs/drivers/video/pmag-aa-fb.h	2002-10-01 17:48:47.000000000 +0200
@@ -0,0 +1,28 @@
+/*
+ *	linux/drivers/video/pmag-aa-fb.h
+ *
+ *	TurboChannel PMAG-AA framebuffer card support,
+ *	Copyright (C) 2002 by Karsten Merker <merker@debian.org>
+ *
+ *	This file is subject to the terms and conditions of the GNU General
+ *	Public License.  See the file COPYING in the main directory of this
+ *	archive for more details.
+ */
+
+/*
+ * Bt455 RAM DAC register base offset (rel. to TC slot base address)
+ */
+
+#define PMAG_AA_BT455_OFFSET                    0x100000
+
+/*
+ * Bt431 cursor generator offset (rel. to TC slot base address)
+ */
+
+#define PMAG_AA_BT431_OFFSET			0x180000
+
+/*
+ * Begin of PMAG-AA framebuffer memory relative to TC slot address,
+ * resolution is 1280x1024x1 (8 bits deep, but only LSB is used)
+ */
+
+#define PMAG_AA_ONBOARD_FBMEM_OFFSET    0x200000
diff -u -Nur --exclude CVS --exclude include/config --exclude pmag-aa-fb-v2.diff linux-mips-cvs-meeting/include/video/fbcon-mfb8.h linux-mips-cvs/include/video/fbcon-mfb8.h
--- linux-mips-cvs-meeting/include/video/fbcon-mfb8.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-mips-cvs/include/video/fbcon-mfb8.h	2002-10-01 17:49:07.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ *  FBcon low-level driver for Monochrome (mfb)
+ */
+
+#ifndef _VIDEO_FBCON_MFB8_H
+#define _VIDEO_FBCON_MFB8_H
+
+#include <linux/config.h>
+
+#ifdef MODULE
+#if defined(CONFIG_FBCON_MFB8) || defined(CONFIG_FBCON_MFB8_MODULE)
+#define FBCON_HAS_MFB8
+#endif
+#else
+#if defined(CONFIG_FBCON_MFB8)
+#define FBCON_HAS_MFB8
+#endif
+#endif
+
+extern struct display_switch fbcon_mfb8;
+extern void fbcon_mfb8_setup(struct display *p);
+extern void fbcon_mfb8_bmove(struct display *p, int sy, int sx, int dy, int dx,
+			    int height, int width);
+extern void fbcon_mfb8_clear(struct vc_data *conp, struct display *p, int sy,
+			    int sx, int height, int width);
+extern void fbcon_mfb8_putc(struct vc_data *conp, struct display *p, int c,
+			   int yy, int xx);
+extern void fbcon_mfb8_putcs(struct vc_data *conp, struct display *p,
+			    const unsigned short *s, int count, int yy, int xx);
+extern void fbcon_mfb8_revc(struct display *p, int xx, int yy);
+
+#endif /* _VIDEO_FBCON_MFB8_H */