Merge mainline into newreloc
This commit is contained in:
commit
88d2919b7d
30 changed files with 213 additions and 161 deletions
|
@ -329,7 +329,4 @@ grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
|
|||
grub_video_driver_id_t
|
||||
grub_video_get_driver_id (void);
|
||||
|
||||
grub_video_driver_id_t
|
||||
grub_video_get_driver_id (void);
|
||||
|
||||
#endif /* ! GRUB_VIDEO_HEADER */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue