diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:56:28 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:56:28 +0000 |
| commit | 5a171ddbe0a502527368f00e663df035d1d36019 (patch) | |
| tree | bf8712712f7fb0ed15d2ec33af84d7a04c3a6d7c /drivers/video | |
| parent | f4ae78d536e6dfaeb24c01b331fc38d950ed062b (diff) | |
Merge with Linux 2.4.0-test4-pre3.
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fonts.c b/drivers/video/fonts.c index 52ab1a697..82aedaf0f 100644 --- a/drivers/video/fonts.c +++ b/drivers/video/fonts.c @@ -30,7 +30,7 @@ static struct fbcon_font_desc *fbcon_fonts[] = { &font_vga_8x16, #endif #ifdef CONFIG_FONT_6x11 -#if defined(CONFIG_MAC) || defined(CONFIG_FB_SBUS) +#if defined(CONFIG_FBCON_MAC) || defined(CONFIG_FB_SBUS) #undef NO_FONTS #endif &font_vga_6x11, |