merge with mainline

This commit is contained in:
BVK Chaitanya committed 2010-07-13 00:43:28 +05:30
commit 297f0c2b6e
218 files changed
+35637 -4957

No files matched your search

+2
View File
@@ -302,6 +302,8 @@ static struct grub_video_adapter grub_video_uga_adapter =
.name = "EFI UGA driver",
.id = GRUB_VIDEO_DRIVER_EFI_UGA,
.prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE_DIRTY,
.init = grub_video_uga_init,
.fini = grub_video_uga_fini,
.setup = grub_video_uga_setup,