diff options
Diffstat (limited to 'ao-tools/ao-load')
| -rw-r--r-- | ao-tools/ao-load/Makefile.am | 2 | ||||
| -rw-r--r-- | ao-tools/ao-load/ao-load.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ao-tools/ao-load/Makefile.am b/ao-tools/ao-load/Makefile.am index e8fed8b0..3c48dc27 100644 --- a/ao-tools/ao-load/Makefile.am +++ b/ao-tools/ao-load/Makefile.am @@ -9,4 +9,4 @@ ao_load_LDADD=$(AO_LOAD_LIBS) $(LIBUSB_LIBS) ao_load_SOURCES = ao-load.c -man_MANS = ao-load.1
\ No newline at end of file +man_MANS = ao-load.1 diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c index c27fcbe9..642af2fe 100644 --- a/ao-tools/ao-load/ao-load.c +++ b/ao-tools/ao-load/ao-load.c @@ -89,6 +89,9 @@ rewrite(struct hex_image *image, unsigned addr, char *data, int len) memcpy(image->data + addr - image->address, data, len); } +<<<<<<< HEAD:ao-tools/ao-load/ao-load.c +static const struct option +======= static const struct option options[] = { { .name = "tty", .has_arg = 1, .val = 'T' }, { 0, 0, 0, 0}, @@ -100,6 +103,7 @@ static void usage(char *program) exit(1); } +>>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c int main (int argc, char **argv) { |