diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
commit | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 (patch) | |
tree | e854c807526ce8b7215446fc34f52832fd0bcc54 /lib_generic | |
parent | 34a7ceeff449be015a37d0e3f3178ca313618349 (diff) | |
parent | ba999c531ed16ec749b2b6f4b0133cee38842b91 (diff) |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'lib_generic')
-rw-r--r-- | lib_generic/crc32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 3db224a364..3d99b69296 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,8 +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. |