merge with mainline
This commit is contained in:
commit
9444311834
4 changed files with 13 additions and 8 deletions
|
@ -148,7 +148,7 @@ compressed:
|
|||
|
||||
VARIABLE(grub_prefix)
|
||||
|
||||
/* to be filled by grub-mkelfimage */
|
||||
/* to be filled by grub-mkimage */
|
||||
|
||||
/*
|
||||
* Leave some breathing room for the prefix.
|
||||
|
|
|
@ -33,7 +33,7 @@ _start:
|
|||
. = _start + GRUB_KERNEL_MACHINE_PREFIX
|
||||
|
||||
VARIABLE(grub_prefix)
|
||||
/* to be filled by grub-mkelfimage */
|
||||
/* to be filled by grub-mkimage */
|
||||
|
||||
/*
|
||||
* Leave some breathing room for the prefix.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue