Re: [U-Boot] [PATCH] mtd: cfi: Zap CFI_FLASH_SHIFT_WIDTH redefinition

2017-08-08 Thread Stefan Roese
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 Cc: Tom Rini Applied to u-boot-cfi-flash/master. Thanks, Stefan

[U-Boot] [PATCH] mtd: cfi: Zap CFI_FLASH_SHIFT_WIDTH redefinition

2017-07-21 Thread Marek Vasut
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 Cc: Tom Rini --- include/flash.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/flash.h b/include/flash.h index 2a5e13