patch-2.4.21 linux-2.4.21/drivers/video/sti/sticore.c

Next file: linux-2.4.21/drivers/video/sti/stifb.c
Previous file: linux-2.4.21/drivers/video/sstfb.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/drivers/video/sti/sticore.c linux-2.4.21/drivers/video/sti/sticore.c
@@ -467,6 +467,7 @@
 	return 0;
 }
 
+#ifdef CONFIG_FB
 struct sti_cooked_font * __init
 sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
 {
@@ -523,6 +524,13 @@
 
 	return cooked_font;
 }
+#else
+struct sti_cooked_font * __init
+sti_select_fbfont(struct sti_cooked_rom *cooked_rom, char *fbfont_name)
+{
+	return NULL;
+}
+#endif
 
 struct sti_cooked_font * __init
 sti_select_font(struct sti_cooked_rom *rom,

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