Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-23 15:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge with mainline

Browse Source
This commit is contained in:
BVK Chaitanya committed 2010-05-10 12:59:57 +05:30
2 parents ac49c9200a c6e5caab1d
commit 7361f78ca6
10 files changed
+616 -578
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/include/grub/ieee1275/ieee1275.h
+3
View File
@@ -100,6 +100,9 @@ enum grub_ieee1275_flag
/* Open Hack'Ware don't support the ANSI sequence. */
GRUB_IEEE1275_FLAG_NO_ANSI,
/* OpenFirmware hangs on qemu if one requests any memory below 1.5 MiB. */
GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM,
};
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
grub-core/include/grub/video.h
+2 -1
View File
@@ -181,7 +181,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