merge trunk
This commit is contained in:
commit
b3e9c48799
3 changed files with 13 additions and 5 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2011-08-20 Szymon Janc <szymon@janc.net.pl>
|
||||
|
||||
* grub-core/loader/i386/linux.c (grub_linux_setup_video): Add
|
||||
GRUB_VIDEO_DRIVER_RADEON_FULOONG2E to switch case statement.
|
||||
|
||||
2011-08-20 Szymon Janc <szymon@janc.net.pl>
|
||||
|
||||
* grub-core/io/gzio.c (grub_gzio_open): Always return original io if
|
||||
file type was not recognized correctly (not gzip or corrupted).
|
||||
|
||||
2011-08-19 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/kern/mips/loongson/init.c (grub_reboot): Reboot Fuloong.
|
||||
|
|
|
@ -1179,12 +1179,9 @@ grub_gzio_open (grub_file_t io)
|
|||
grub_free (gzio);
|
||||
grub_free (file);
|
||||
grub_file_seek (io, 0);
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
|
||||
if (grub_errno == GRUB_ERR_BAD_FILE_TYPE)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
return io;
|
||||
}
|
||||
return io;
|
||||
}
|
||||
|
||||
return file;
|
||||
|
|
|
@ -374,6 +374,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
|
|||
case GRUB_VIDEO_DRIVER_VGA:
|
||||
case GRUB_VIDEO_DRIVER_CIRRUS:
|
||||
case GRUB_VIDEO_DRIVER_BOCHS:
|
||||
case GRUB_VIDEO_DRIVER_RADEON_FULOONG2E:
|
||||
/* Make gcc happy. */
|
||||
case GRUB_VIDEO_DRIVER_SDL:
|
||||
case GRUB_VIDEO_DRIVER_NONE:
|
||||
|
|
Loading…
Reference in a new issue