merge mainline into bidi

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-09 11:03:03 +02:00
commit 7dcef22cd3
5 changed files with 475 additions and 528 deletions

View file

@ -190,7 +190,8 @@ typedef enum grub_video_driver_id
GRUB_VIDEO_DRIVER_VBE,
GRUB_VIDEO_DRIVER_EFI_UGA,
GRUB_VIDEO_DRIVER_EFI_GOP,
GRUB_VIDEO_DRIVER_SM712
GRUB_VIDEO_DRIVER_SM712,
GRUB_VIDEO_DRIVER_VGA
} grub_video_driver_id_t;
struct grub_video_adapter