Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / lib_generic / crc32.c

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index b6a7a91620f130f3198fc22fc3fc272f586f10ce..b27048ceebf2f07075457aedc5f1b0a3cb6db381 100644 (file)
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -17,7 +17,7 @@
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 #include <watchdog.h>
 #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(CONFIG_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.