diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-10-12 11:29:33 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-10-12 11:29:33 -0500 |
| commit | f7b190d3120611d9d47c3ea784c10f5f713655f5 (patch) | |
| tree | 7b2ebba6cde3c4fd4e024516296d63f214ff9464 /lib_generic | |
| parent | 0ee90cb77e01d6e8ccd37e1bd96678597875c391 (diff) | |
| parent | 87621bc24789e024c62a8a12bebd592943cdfb02 (diff) | |
| download | u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.zip u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.tar.gz u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.tar.bz2 | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'lib_generic')
| -rw-r--r-- | lib_generic/crc32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 8283413..3d99b69 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,9 +171,8 @@ uLong ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffL; } -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) \ - || (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) - +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || \ + ((CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY)) /* No ones complement version. JFFS2 (and other things ?) * don't use ones compliment in their CRC calculations. |