diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 05:38:58 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 05:38:58 +0200 |
| commit | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (patch) | |
| tree | 16fbe6ba431bcf949ee8645510b0c2fd39b5810f /drivers/video/console/fonts.c | |
| parent | [wireless] ipw2100: fix build after applying SuSE cleanups (diff) | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.tar.xz linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/console/fonts.c')
| -rw-r--r-- | drivers/video/console/fonts.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c index 465d678230ae..e79b29702649 100644 --- a/drivers/video/console/fonts.c +++ b/drivers/video/console/fonts.c @@ -36,6 +36,10 @@ static struct font_desc *fonts[] = { #undef NO_FONTS &font_vga_6x11, #endif +#ifdef CONFIG_FONT_7x14 +#undef NO_FONTS + &font_7x14, +#endif #ifdef CONFIG_FONT_SUN8x16 #undef NO_FONTS &font_sun_8x16, @@ -44,6 +48,10 @@ static struct font_desc *fonts[] = { #undef NO_FONTS &font_sun_12x22, #endif +#ifdef CONFIG_FONT_10x18 +#undef NO_FONTS + &font_10x18, +#endif #ifdef CONFIG_FONT_ACORN_8x8 #undef NO_FONTS &font_acorn_8x8, |