mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
* grub-core/term/i386/pc/vga_text.c: Add GRUB_MACHINE_MULTIBOOT to
grub_vga_text_init/grub_vga_text_fini.
This commit is contained in:
1 parent
629e6a3363
commit
7acd2ae1fb
2 files changed
+8
-3
No files matched your search
@@ -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>
|
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
* grub-core/loader/i386/xnu.c (grub_xnu_boot): Fix format specification.
|
* grub-core/loader/i386/xnu.c (grub_xnu_boot): Fix format specification.
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
#include <grub/types.h>
|
#include <grub/types.h>
|
||||||
#include <grub/vga.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>
|
#include <grub/machine/console.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ static struct grub_term_output grub_vga_text_term =
|
|||||||
.highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
|
.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)
|
void grub_vga_text_init (void)
|
||||||
#else
|
#else
|
||||||
GRUB_MOD_INIT(vga_text)
|
GRUB_MOD_INIT(vga_text)
|
||||||
@@ -181,7 +181,7 @@ GRUB_MOD_INIT(vga_text)
|
|||||||
grub_term_register_output ("vga_text", &grub_vga_text_term);
|
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)
|
void grub_vga_text_fini (void)
|
||||||
#else
|
#else
|
||||||
GRUB_MOD_FINI(vga_text)
|
GRUB_MOD_FINI(vga_text)
|
||||||
|
|||||||
Reference in new issue
Block a user