* grub-core/kern/vga_init.c: Fix compilation on qemu-mips.

	* grub-core/kern/mips/qemu_mips/init.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 64fb3dd3b52b4de6f8920a3440de281127aaf109..e114722fe03dd506798ca57bf8b4e32b50c4493f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * 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  <cjwatson@ubuntu.com>
 
        * 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 e003976ef7c94328fed3870bf0437364446c8e67..6a5af2a93fb0d0ba57deb05aef1ab8d2bfa2bb14 100644 (file)
--- 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 301721d374d9627964b4dbccce0d35e9b7512349..3fe2f16de685178d6fa6a01af2f33fe079be5eec 100644 (file)
--- 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 <ascii.h>
-#endif
 
 #ifdef __mips__
 #define VGA_ADDR 0xb00a0000