diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2017-07-21 23:12:29 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2017-08-08 14:29:48 +0200 |
| commit | bd2d489e248dada86a557c8d2ee4f914a2b0c8eb (patch) | |
| tree | add094705672c6140a77dfb880a2f8182a6110d2 /include/flash.h | |
| parent | eaa90e5df2a4a1cb12fb73571978a9379242d0b5 (diff) | |
| download | u-boot-bd2d489e248dada86a557c8d2ee4f914a2b0c8eb.tar.gz u-boot-bd2d489e248dada86a557c8d2ee4f914a2b0c8eb.tar.bz2 u-boot-bd2d489e248dada86a557c8d2ee4f914a2b0c8eb.zip | |
mtd: cfi: Zap CFI_FLASH_SHIFT_WIDTH redefinition
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>
Diffstat (limited to 'include/flash.h')
| -rw-r--r-- | include/flash.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 */ |