summaryrefslogtreecommitdiff
path: root/lib_generic/crc32.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-19 00:38:23 +0200
committerWolfgang Denk <wd@denx.de>2009-07-19 00:38:23 +0200
commita694610d3361465d4c8d27dde72ab8b63d31115e (patch)
tree063d03bcf75538fe45f940eda5b1e6f1859a96fb /lib_generic/crc32.c
parent5669ed4557edf2714203aa8625c9fcd5a753b338 (diff)
parent2419169f5749d7af501b3b77a5336d1d535320de (diff)
downloadu-boot-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'lib_generic/crc32.c')
-rw-r--r--lib_generic/crc32.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 3927ce13c2..b27048ceeb 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -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.