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/sysdump.h | |
| 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/sysdump.h')
| -rw-r--r-- | com32/sysdump/sysdump.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/com32/sysdump/sysdump.h b/com32/sysdump/sysdump.h index a5b963f8..72e4875e 100644 --- a/com32/sysdump/sysdump.h +++ b/com32/sysdump/sysdump.h @@ -1,15 +1,15 @@ #ifndef SYSDUMP_H #define SYSDUMP_H -struct backend; +#include <libupload/upload_backend.h> -void dump_memory_map(struct backend *); +void dump_memory_map(struct upload_backend *); void snapshot_lowmem(void); -void dump_memory(struct backend *); -void dump_dmi(struct backend *); -void dump_acpi(struct backend *); -void dump_cpuid(struct backend *); -void dump_pci(struct backend *); -void dump_vesa_tables(struct backend *); +void dump_memory(struct upload_backend *); +void dump_dmi(struct upload_backend *); +void dump_acpi(struct upload_backend *); +void dump_cpuid(struct upload_backend *); +void dump_pci(struct upload_backend *); +void dump_vesa_tables(struct upload_backend *); #endif /* SYSDUMP_H */ |