diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-03-20 17:14:21 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-03-22 13:57:44 +0000 |
| commit | 37d43cf9dd5dd2d2cef1e86aa651097473fd0b48 (patch) | |
| tree | 07a7df546f178c4e1576f4cbcc0bb4db3a8e18b4 /com32/lib/syslinux/shuffle.c | |
| parent | bf20364b582c383b4927f898de213b1cc0981a80 (diff) | |
| parent | a107cb3b6fa219cf5f65bef366c9b00b108e9a3a (diff) | |
| download | syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.gz | |
Merge tag 'syslinux-5.10-pre2' into for-hpa/elflink/firmware
syslinux-5.10-pre2
Conflicts:
NEWS
com32/include/netinet/in.h
com32/include/sys/cpu.h
com32/lib/Makefile
core/Makefile
core/fs/diskio.c
core/fs/pxe/pxe.h
core/init.c
core/mem/free.c
core/mem/malloc.c
mk/devel.mk
version
Diffstat (limited to 'com32/lib/syslinux/shuffle.c')
| -rw-r--r-- | com32/lib/syslinux/shuffle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/com32/lib/syslinux/shuffle.c b/com32/lib/syslinux/shuffle.c index d014340c..ce85a5c4 100644 --- a/com32/lib/syslinux/shuffle.c +++ b/com32/lib/syslinux/shuffle.c @@ -135,7 +135,7 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, goto bail; #if DEBUG > 1 - syslinux_dump_movelist(stdout, fraglist); + syslinux_dump_movelist(fraglist); #endif if (syslinux_compute_movelist(&moves, fraglist, rxmap)) @@ -155,7 +155,7 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, #if DEBUG > 1 dprintf("Final movelist:\n"); - syslinux_dump_movelist(stdout, moves); + syslinux_dump_movelist(moves); #endif syslinux_free_memmap(rxmap); |