diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-27 10:41:30 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-30 09:51:36 +0100 |
| commit | 0d6f330878173c7ba45b884f3e41ce40b917c73c (patch) | |
| tree | 0a887066d35d8b01914330d6ab6818fe015a5a9d /com32/gfxboot | |
| parent | 0fcd9a48603497dcc2727570a50a4401bb0fd085 (diff) | |
| parent | f0bbf9dd40f37f8c4870a33784996efd56955a75 (diff) | |
| download | syslinux-0d6f330878173c7ba45b884f3e41ce40b917c73c.tar.gz | |
Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware
Conflicts:
Makefile
com32/elflink/ldlinux/adv.c
com32/elflink/ldlinux/kernel.c
com32/elflink/ldlinux/ldlinux.c
com32/include/bitsize/stddef.h
com32/include/bitsize/stdint.h
com32/include/stdint.h
com32/include/sys/module.h
com32/include/sys/x86_64/bitops.h
com32/include/syslinux/linux.h
com32/lib/Makefile
com32/lib/sys/ansicon_write.c
com32/lib/sys/module/elfutils.h
com32/lib/sys/vesa/efi/fill.h
com32/lib/syslinux/load_linux.c
com32/lib/syslinux/serial.c
com32/lib/syslinux/shuffle.c
core/conio.c
core/elflink/config.c
core/elflink/load_env32.c
core/graphics.c
core/include/graphics.h
core/init.c
core/pxelinux.asm
mk/elf.mk
mk/lib.mk
Diffstat (limited to 'com32/gfxboot')
| -rw-r--r-- | com32/gfxboot/gfxboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c index 35d180a6..aa05caf8 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -962,7 +962,7 @@ void boot_entry(menu_t *menu_ptr, char *arg) gfx_done(); - syslinux_boot_linux(kernel, kernel_size, initrd, arg); + syslinux_boot_linux(kernel, kernel_size, initrd, NULL, arg); } |