patch-2.3.16 linux/drivers/video/sbusfb.c

Next file: linux/drivers/video/tcxfb.c
Previous file: linux/drivers/video/promcon.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/drivers/video/sbusfb.c linux/drivers/video/sbusfb.c
@@ -1086,6 +1086,10 @@
 	case FBTYPE_MDICOLOR:
 		p = cgfourteenfb_init(fb); break;
 #endif
+#ifdef CONFIG_FB_P9100
+	case FBTYPE_P9100COLOR:
+		p = p9100fb_init(fb); break;
+#endif
 	}
 	
 	if (!p) {
@@ -1149,6 +1153,8 @@
 		return FBTYPE_SUN2BW;
 	if (!strcmp(name, "tcx"))
 		return FBTYPE_TCXCOLOR;
+	if (!strcmp(name, "p9100"))
+		return FBTYPE_P9100COLOR;
 	return FBTYPE_NOTYPE;
 }
 
@@ -1188,7 +1194,7 @@
 		}
 	}
 #endif
-	if (!SBus_chain) return;
+	if (!SBus_chain) return 0;
 	for_all_sbusdev(sbdp, sbus) {
 		type = known_card(sbdp->prom_name);
 		if (type == FBTYPE_NOTYPE) continue;

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