Fix JFFS2 compilation problem

Patch by Stefan Roese, 12 Oct 2006

diff --git a/CHANGELOG b/CHANGELOG
index 98b3324eb9422c07cdf3112d48643d361818a7f2..68aa65ae3c39ed489a9899fce6f652b45f82f8c2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix JFFS2 compilation problem
+  Patch by Stefan Roese, 12 Oct 2006
+
 * Cleanup of NAND update patch (remove changelog from cmd_nand.c)
   Patch by Guido Classen, 10 Oct 2006
 

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 3db224a3649981bec3b5705014ed5467bd51c26f..3d99b69296c7e4504126b175a58176581ff57f08 100644 (file)
--- 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.