]> git.sur5r.net Git - u-boot/commitdiff
mtd: cfi: Zap CFI_FLASH_SHIFT_WIDTH redefinition
authorMarek Vasut <marek.vasut@gmail.com>
Fri, 21 Jul 2017 21:12:29 +0000 (23:12 +0200)
committerStefan Roese <sr@denx.de>
Tue, 8 Aug 2017 12:29:48 +0000 (14:29 +0200)
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>
Signed-off-by: Stefan Roese <sr@denx.de>
include/flash.h

index 2a5e13a13d380b9c131a74c97900e4663d11e7b0..908d7cec6ca8c9fed255754632d3b7237da9c74e 100644 (file)
@@ -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
  */