From 3696803bc90e30f970965e71548f8f13ed534446 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 24 Jan 2010 04:38:39 +0000 Subject: [PATCH] both the public and internal headers declare a urj_flash_detectflash prototype git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1725 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/ChangeLog | 2 ++ urjtag/src/flash/flash.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 040e8f90..3bacf574 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -94,6 +94,8 @@ src/tap/usbconn/libusb.c: Drop redundant #ifdef protection as the Makefile already has conditional logic. + * src/flash/flash.h: Delete duplicate urj_flash_detectflash prototype. + 2010-01-22 Mike Frysinger * src/cmd/cmd_bit.c (cmd_bit_print_params): Fix strncat length handling. diff --git a/urjtag/src/flash/flash.h b/urjtag/src/flash/flash.h index 3cf8f493..b7b01e3b 100644 --- a/urjtag/src/flash/flash.h +++ b/urjtag/src/flash/flash.h @@ -52,9 +52,6 @@ struct URJ_FLASH_CFI_ARRAY urj_flash_cfi_chip_t **cfi_chips; }; -/** @return URJ_STATUS_OK on success; URJ_STATUS_FAIL on error */ -int urj_flash_detectflash (urj_log_level_t ll, urj_bus_t *bus, uint32_t adr); - extern urj_flash_cfi_array_t *urj_flash_cfi_array; #endif /* URJ_FLASH_H */