From 797abd0a23a120b1816af827cebcecc9a6608499 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 14 Aug 2013 09:50:57 +0200 Subject: [PATCH] * grub-core/kern/vga_init.c: Fix compilation on qemu-mips. * grub-core/kern/mips/qemu_mips/init.c: Likewise. --- ChangeLog | 5 +++++ grub-core/kern/mips/qemu_mips/init.c | 2 -- grub-core/kern/vga_init.c | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64fb3dd3b..e114722fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-14 Vladimir Serbinenko + + * grub-core/kern/vga_init.c: Fix compilation on qemu-mips. + * grub-core/kern/mips/qemu_mips/init.c: Likewise. + 2013-08-13 Colin Watson * util/getroot.c (grub_util_biosdisk_get_grub_dev): Zero out diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c index e003976ef..6a5af2a93 100644 --- a/grub-core/kern/mips/qemu_mips/init.c +++ b/grub-core/kern/mips/qemu_mips/init.c @@ -57,8 +57,6 @@ grub_machine_init (void) grub_install_get_time_ms (grub_rtc_get_time_ms); - grub_font_init (); - grub_keylayouts_init (); grub_at_keyboard_init (); diff --git a/grub-core/kern/vga_init.c b/grub-core/kern/vga_init.c index 301721d37..3fe2f16de 100644 --- a/grub-core/kern/vga_init.c +++ b/grub-core/kern/vga_init.c @@ -46,11 +46,7 @@ static struct {grub_uint8_t r, g, b, a; } colors[] = {0xFE, 0xFE, 0xFE, 0xFF} // 15 = white }; -#ifdef __mips__ -extern unsigned char ascii_bitmaps[]; -#else #include -#endif #ifdef __mips__ #define VGA_ADDR 0xb00a0000