patch-2.4.20 linux-2.4.20/drivers/video/newport_con.c

Next file: linux-2.4.20/drivers/video/pm3fb.h
Previous file: linux-2.4.20/drivers/video/macfb.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/video/newport_con.c linux-2.4.20/drivers/video/newport_con.c
@@ -36,6 +36,7 @@
 #define LOGO_H		80
 
 extern struct fbcon_font_desc font_vga_8x16;
+extern unsigned long sgi_gfxaddr;
 
 #define FONT_DATA ((unsigned char *)font_vga_8x16.data)
 
@@ -290,8 +291,9 @@
 	int i;
 	struct newport_regs *p;
 
-	npregs = (struct newport_regs *) (KSEG1 + 0x1f0f0000);
-
+	if (!sgi_gfxaddr)
+		return NULL;
+	npregs = (struct newport_regs *) (KSEG1 + sgi_gfxaddr);
 	p = npregs;
 	p->cset.config = NPORT_CFG_GD0;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)