diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-06-28 15:07:50 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-06-28 15:30:12 +0100 |
commit | d44ea657666e3a34d3859fc7262185e24c0b40fe (patch) | |
tree | ce274c90f71c9b11ee83c3c9e30681c1af77c414 /efi/main.c | |
parent | a17fdfb873bebc135a73580a493913cdec066f28 (diff) | |
parent | 00d0f3add99de6d9c83ff2492bac175a5e1b8a11 (diff) | |
download | syslinux-d44ea657666e3a34d3859fc7262185e24c0b40fe.tar.gz |
Merge tag 'syslinux-5.11-pre3' into firmwaresyslinux-6.01-pre5
syslinux-5.11-pre3
Conflicts:
core/Makefile
Diffstat (limited to 'efi/main.c')
-rw-r--r-- | efi/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -117,7 +117,7 @@ void printf_init(void) { } -void local_boot16(void) +__export void local_boot(uint16_t ax) { } |