diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 17:19:32 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 17:19:32 -0700 |
| commit | 6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3 (patch) | |
| tree | eb738bf1a45e1fe0ee17fca8509c96a3579a6592 /com32/sysdump/memmap.c | |
| parent | 3b772bb6588a28fd5741ca86f579e3838d96eb80 (diff) | |
| parent | 0c8bfd91ab11a00b796f32982a30414c8bac7ec9 (diff) | |
| download | syslinux-4.10-pre6.tar.gz | |
Merge remote-tracking branch 'origin/master' into lwipsyslinux-4.10-pre6
Resolved Conflicts:
com32/include/netinet/in.h
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/sysdump/memmap.c')
| -rw-r--r-- | com32/sysdump/memmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/com32/sysdump/memmap.c b/com32/sysdump/memmap.c index 251107d5..929873fe 100644 --- a/com32/sysdump/memmap.c +++ b/com32/sysdump/memmap.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <com32.h> #include "sysdump.h" -#include "backend.h" #define E820_CHUNK 128 struct e820_info { @@ -16,7 +15,7 @@ struct e820_info { uint8_t data[24]; }; -static void dump_e820(struct backend *be) +static void dump_e820(struct upload_backend *be) { com32sys_t ireg, oreg; struct e820_info *curr; @@ -63,7 +62,7 @@ static void dump_e820(struct backend *be) lfree(curr); } -void dump_memory_map(struct backend *be) +void dump_memory_map(struct upload_backend *be) { com32sys_t ireg, oreg; |