summaryrefslogtreecommitdiffstats
path: root/drivers/video/console/sticore.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
committerWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
commit5c34202b8bf942da411b6599668a76b07449bbfd (patch)
tree5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/video/console/sticore.c
parent[WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff)
downloadlinux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz
linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/console/sticore.c')
-rw-r--r--drivers/video/console/sticore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 88e7038eab88..717b360d0415 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -495,7 +495,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
return NULL;
fbfont = find_font(fbfont_name);
if (!fbfont)
- fbfont = get_default_font(1024,768);
+ fbfont = get_default_font(1024,768, ~(u32)0, ~(u32)0);
if (!fbfont)
return NULL;