summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2017-07-21 21:12:29 (GMT)
committerStefan Roese <sr@denx.de>2017-08-08 12:29:48 (GMT)
commitbd2d489e248dada86a557c8d2ee4f914a2b0c8eb (patch)
treeadd094705672c6140a77dfb880a2f8182a6110d2
parenteaa90e5df2a4a1cb12fb73571978a9379242d0b5 (diff)
downloadu-boot-fsl-qoriq-bd2d489e248dada86a557c8d2ee4f914a2b0c8eb.tar.xz
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>
-rw-r--r--include/flash.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/flash.h b/include/flash.h
index 2a5e13a..908d7ce 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
*/