From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 30 Jun 2010 00:30:05 +0000 (+0200)
Subject: Merge mainline into yeeloongfw
X-Git-Tag: 1.99~780^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7e79e8a6a847a5b9bbc8eb9ce2dd49631726ddc;p=thirdparty%2Fgrub.git

Merge mainline into yeeloongfw
---

b7e79e8a6a847a5b9bbc8eb9ce2dd49631726ddc
diff --cc video/sm712.c
index cee9831bb,44bfd74c3..a58032c42
--- a/video/sm712.c
+++ b/video/sm712.c
@@@ -198,19 -143,19 +195,6 @@@ grub_video_sm712_setup (unsigned int wi
    return err;
  }
  
--static grub_err_t
--grub_video_sm712_set_palette (unsigned int start, unsigned int count,
--                            struct grub_video_palette_data *palette_data)
--{
--  if (framebuffer.index_color_mode)
--    {
--      /* TODO: Implement setting indexed color mode palette to hardware.  */
--    }
--
--  /* Then set color to emulated palette.  */
--  return grub_video_fb_set_palette (start, count, palette_data);
--}
--
  static grub_err_t
  grub_video_sm712_swap_buffers (void)
  {
@@@ -250,7 -197,7 +236,7 @@@ static struct grub_video_adapter grub_v
      .setup = grub_video_sm712_setup,
      .get_info = grub_video_fb_get_info,
      .get_info_and_fini = grub_video_sm712_get_info_and_fini,
--    .set_palette = grub_video_sm712_set_palette,
++    .set_palette = grub_video_fb_set_palette,
      .get_palette = grub_video_fb_get_palette,
      .set_viewport = grub_video_fb_set_viewport,
      .get_viewport = grub_video_fb_get_viewport,