Apply 2.6.14 patches from Andre

[yaffs2.git] / yaffs_mtdif.c

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 63f73f02029d27fcd8084e63d2c7f62d662a6d91..7dbf07a953518fe1f69bab885f79238bc98fea54 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -14,7 +14,7 @@
  */
 
 const char *yaffs_mtdif_c_version =
-    "$Id: yaffs_mtdif.c,v 1.11 2005-09-20 05:23:41 charles Exp $";
+    "$Id: yaffs_mtdif.c,v 1.13 2005-11-07 07:13:33 charles Exp $";
 
 #include "yportenv.h"
 
@@ -28,9 +28,7 @@ const char *yaffs_mtdif_c_version =
 
 static struct nand_oobinfo yaffs_oobinfo = {
        .useecc = 1,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8))
        .eccbytes = 6,
-#endif
        .eccpos = {8, 9, 10, 13, 14, 15}
 };
 
@@ -89,7 +87,8 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
        __u8 *spareAsBytes = (__u8 *) spare;
 
        if (data && spare) {
-               if (dev->useNANDECC) {  /* Careful, this call adds 2 ints */
+               if (dev->useNANDECC) {  
+                       /* Careful, this call adds 2 ints */
                        /* to the end of the spare data.  Calling function */
                        /* should allocate enough memory for spare, */
                        /* i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)]. */