* grub-core/term/i386/pc/vga_text.c: Add GRUB_MACHINE_MULTIBOOT to

	grub_vga_text_init/grub_vga_text_fini.

diff --git a/ChangeLog b/ChangeLog
index fc8bdcdfb680c75ce76d9f41d4727626ecfea2c6..e63e4d99caf614297ffc74aed012dca2a0c08b81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/term/i386/pc/vga_text.c: Add GRUB_MACHINE_MULTIBOOT to
+       grub_vga_text_init/grub_vga_text_fini.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/xnu.c (grub_xnu_boot): Fix format specification.

diff --git a/grub-core/term/i386/pc/vga_text.c b/grub-core/term/i386/pc/vga_text.c
index 8be3169b21c03e8c2948c3f033ff0e3636565984..7c2de2024a71501e8700eb25201a00136bce04d6 100644 (file)
--- a/grub-core/term/i386/pc/vga_text.c
+++ b/grub-core/term/i386/pc/vga_text.c
@@ -22,7 +22,7 @@
 #include <grub/types.h>
 #include <grub/vga.h>
 
-#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
+#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
 #include <grub/machine/console.h>
 #endif
 
@@ -172,7 +172,7 @@ static struct grub_term_output grub_vga_text_term =
     .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
 
-#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
+#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
 void grub_vga_text_init (void)
 #else
 GRUB_MOD_INIT(vga_text)
@@ -181,7 +181,7 @@ GRUB_MOD_INIT(vga_text)
   grub_term_register_output ("vga_text", &grub_vga_text_term);
 }
 
-#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
+#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
 void grub_vga_text_fini (void)
 #else
 GRUB_MOD_FINI(vga_text)