]> git.baikalelectronics.ru Git - uboot.git/commit
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)
commit9d178d772a5c9a17c031dc5ba2a2c57a81902d36
treeadd094705672c6140a77dfb880a2f8182a6110d2
parent31825b24940eb4439fdec317ad84263017953199
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>
include/flash.h