From 7acd2ae1fbf413d59339d5d08edf03b880d33d50 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Tue, 28 Feb 2012 11:12:32 +0100 Subject: [PATCH] * grub-core/term/i386/pc/vga_text.c: Add GRUB_MACHINE_MULTIBOOT to grub_vga_text_init/grub_vga_text_fini. --- ChangeLog | 5 +++++ grub-core/term/i386/pc/vga_text.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc8bdcdfb..e63e4d99c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-27 Vladimir Serbinenko + + * 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 * 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 8be3169b2..7c2de2024 100644 --- a/grub-core/term/i386/pc/vga_text.c +++ b/grub-core/term/i386/pc/vga_text.c @@ -22,7 +22,7 @@ #include #include -#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 #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)