diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 12:52:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 12:52:39 +0000 |
| commit | 477d43b2817c17de1caaedc38e50c3e7235ee585 (patch) | |
| tree | 8ba415f294639d4cdc93d6fa0902215a61a63d12 /target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c | |
| parent | 306f3677ecbecce777f35bfe3a9475901055dff1 (diff) | |
| download | master-31e0f0ae-477d43b2817c17de1caaedc38e50c3e7235ee585.tar.gz master-31e0f0ae-477d43b2817c17de1caaedc38e50c3e7235ee585.tar.bz2 master-31e0f0ae-477d43b2817c17de1caaedc38e50c3e7235ee585.zip | |
generic-2.6: sync yaffs code with the official CVS tree
SVN-Revision: 11378
Diffstat (limited to 'target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c')
| -rw-r--r-- | target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c b/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c index 466e5a44c6..4888b96f6d 100644 --- a/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c +++ b/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_mtdif.c @@ -12,7 +12,7 @@ */ const char *yaffs_mtdif_c_version = - "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $"; + "$Id: yaffs_mtdif.c,v 1.21 2007-12-13 15:35:18 wookey Exp $"; #include "yportenv.h" @@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version = #include "linux/time.h" #include "linux/mtd/nand.h" -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) +#if (MTD_VERSION_CODE < MTD_VERSION(2,6,18)) static struct nand_oobinfo yaffs_oobinfo = { .useecc = 1, .eccbytes = 6, @@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccinfo = { }; #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) +#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17)) static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob) { oob[0] = spare->tagByte0; @@ -75,14 +75,14 @@ int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND, const __u8 * data, const yaffs_Spare * spare) { struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) +#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17)) struct mtd_oob_ops ops; #endif size_t dummy; int retval = 0; loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) +#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17)) __u8 spareAsBytes[8]; /* OOB */ if (data && !spare) @@ -139,14 +139,14 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data, yaffs_Spare * spare) { struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) +#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17)) struct mtd_oob_ops ops; #endif size_t dummy; int retval = 0; loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) +#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17)) __u8 spareAsBytes[8]; /* OOB */ if (data && !spare) |