]> git.ipfire.org Git - people/ms/u-boot.git/commit
projects / people / ms / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eaa90e5) | patch
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)
commitbd2d489e248dada86a557c8d2ee4f914a2b0c8eb
treeadd094705672c6140a77dfb880a2f8182a6110d2tree | snapshot
parenteaa90e5df2a4a1cb12fb73571978a9379242d0b5commit | diff
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 diff | blob | blame | history
"Das U-Boot" Source Tree