* grub-core/commands/lsacpi.c (disp_acpi_xsdt_table): #if'-out the

checks which are always false on some platforms.
	(grub_cmd_lsacpi): Likewise.
	* grub-core/kern/misc.c (grub_strtoul): Likewise.
	* grub-core/loader/multiboot.c (grub_multiboot_set_video_mode):
	Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-09 23:48:34 +01:00
parent def9fc1bb2
commit a4ea2dff4b
4 changed files with 23 additions and 4 deletions

View file

@ -90,7 +90,9 @@ grub_multiboot_set_video_mode (void)
grub_err_t err;
const char *modevar;
if (accepts_video || !GRUB_MACHINE_HAS_VGA_TEXT)
#if GRUB_MACHINE_HAS_VGA_TEXT
if (accepts_video)
#endif
{
modevar = grub_env_get ("gfxpayload");
if (! modevar || *modevar == 0)
@ -105,8 +107,10 @@ grub_multiboot_set_video_mode (void)
grub_free (tmp);
}
}
#if GRUB_MACHINE_HAS_VGA_TEXT
else
err = grub_video_set_mode ("text", 0, 0);
#endif
return err;
}