mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-26 17:19:22 +00:00
merge mainline into newreloc
This commit is contained in:
commit
c6fb51295b
35 files changed
+414
-394
No files matched your search
+1
-1
@@ -52,7 +52,7 @@
|
||||
|
||||
struct grub_relocator *grub_multiboot_relocator = NULL;
|
||||
grub_uint32_t grub_multiboot_payload_eip;
|
||||
#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
|
||||
#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
|
||||
#define DEFAULT_VIDEO_MODE "text"
|
||||
#else
|
||||
#define DEFAULT_VIDEO_MODE "auto"
|
||||
|
||||
Reference in new issue
Block a user