| Message ID | 20170721211229.23365-1-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Commit | bd2d489e248dada86a557c8d2ee4f914a2b0c8eb |
| Delegated to: | Stefan Roese |
| Headers | show |
On 21.07.2017 23:12, Marek Vasut wrote: > This is defined twice in the same file, with the same value, likely > because of some patch merge issue. Pick the uglier one and nuke it. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Tom Rini <trini@konsulko.com> Applied to u-boot-cfi-flash/master. Thanks, Stefan
diff --git a/include/flash.h b/include/flash.h index 2a5e13a13d..908d7cec6c 100644 --- a/include/flash.h +++ b/include/flash.h @@ -67,8 +67,6 @@ typedef unsigned long flash_sect_t; #define FLASH_CFI_BY16 0x02 #define FLASH_CFI_BY32 0x04 #define FLASH_CFI_BY64 0x08 -/* convert between bit value and numeric value */ -#define CFI_FLASH_SHIFT_WIDTH 3 /* * Values for the flash device interface */
This is defined twice in the same file, with the same value, likely because of some patch merge issue. Pick the uglier one and nuke it. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Tom Rini <trini@konsulko.com> --- include/flash.h | 2 -- 1 file changed, 2 deletions(-)