From f704cae368c7716ff60c88f5724dc69d9f25b672 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 28 Nov 2009 00:46:09 +0100 Subject: [PATCH] Fix declarations of previous commit --- include/grub/efi/graphics_output.h | 2 +- video/efi_gop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h index 9127a16d1..a55869dc7 100644 --- a/include/grub/efi/graphics_output.h +++ b/include/grub/efi/graphics_output.h @@ -67,7 +67,7 @@ typedef grub_efi_status_t (*grub_efi_gop_query_mode_t) (struct grub_efi_gop *this, grub_efi_uint32_t mode_number, grub_efi_uintn_t *size_of_info, - struct grub_efi_gop_mode_info *info); + struct grub_efi_gop_mode_info **info); typedef grub_efi_status_t (*grub_efi_gop_set_mode_t) (struct grub_efi_gop *this, diff --git a/video/efi_gop.c b/video/efi_gop.c index 0123ee274..4cbcaba8d 100644 --- a/video/efi_gop.c +++ b/video/efi_gop.c @@ -288,7 +288,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, return err; } - framebuffer.ptr = (void *) gop->mode->fb_base; + framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; grub_dprintf ("video", "GOP: initialising FB @ %p %dx%dx%d\n", framebuffer.ptr, framebuffer.mode_info.width,