summaryrefslogtreecommitdiffstats
path: root/drivers/video/console/fonts.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 11:51:24 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 11:51:24 +0100
commit3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch)
treec4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/video/console/fonts.c
parentMerge branch 'master' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
downloadlinux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz
linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.zip
Merge branch 'master'
Diffstat (limited to 'drivers/video/console/fonts.c')
-rw-r--r--drivers/video/console/fonts.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 4fd07d9eca03..9be83bed1959 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -64,6 +64,10 @@ static const struct font_desc *fonts[] = {
#undef NO_FONTS
&font_mini_4x6,
#endif
+#ifdef CONFIG_FONT_RL
+#undef NO_FONTS
+ &font_rl,
+#endif
};
#define num_fonts (sizeof(fonts)/sizeof(*fonts))