X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=lib_generic%2Fcrc32.c;h=b27048ceebf2f07075457aedc5f1b0a3cb6db381;hb=be33b046b549ad88c204c209508cd7657232ffbd;hp=83d1d1d3a0d180d85a2e6d7af7c73ec15a2f5651;hpb=f3f31757464bd91af4de17de386cb763fa0b6ba0;p=karo-tx-uboot.git diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 83d1d1d3a0..b27048ceeb 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -17,7 +17,7 @@ #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) #include #endif -#include "zlib.h" +#include "u-boot/zlib.h" #define local static #define ZEXPORT /* empty */ @@ -172,9 +172,7 @@ uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len) return crc ^ 0xffffffffL; } -#if defined(CONFIG_CMD_JFFS2) || \ - (defined(CONFIG_CMD_NAND) \ - && !defined(CFG_NAND_LEGACY)) +#if defined(CONFIG_CMD_JFFS2) || defined(CONFIG_CMD_NAND) /* No ones complement version. JFFS2 (and other things ?) * don't use ones compliment in their CRC calculations.