Mercurial > ecos-v3_0-branch
diff packages/fs/jffs2/current/include/linux/jffs2_fs_sb.h @ 1834:121da35df27b
* Merge from public MTD.
* src/build.c: Removed Oyvind Harboe's patch from 2004-04-19
since it was rejected upstream.
| author | asl |
|---|---|
| date | Fri, 12 Nov 2004 16:50:29 +0000 |
| parents | 121121d3d18f |
| children | 9558d3d305bf |
line wrap: on
line diff
--- a/packages/fs/jffs2/current/include/linux/jffs2_fs_sb.h +++ b/packages/fs/jffs2/current/include/linux/jffs2_fs_sb.h @@ -1,4 +1,4 @@ -/* $Id: jffs2_fs_sb.h,v 1.45 2003/10/08 11:46:27 dwmw2 Exp $ */ +/* $Id: jffs2_fs_sb.h,v 1.46 2004/11/03 12:57:39 jwboyer Exp $ */ #ifndef _JFFS2_FS_SB #define _JFFS2_FS_SB @@ -95,7 +95,7 @@ struct jffs2_sb_info { to an obsoleted node. I don't like this. Alternatives welcomed. */ struct semaphore erase_free_sem; -#ifdef CONFIG_JFFS2_FS_NAND +#if defined CONFIG_JFFS2_FS_NAND || defined CONFIG_JFFS2_FS_NOR_ECC /* Write-behind buffer for NAND flash */ unsigned char *wbuf; uint32_t wbuf_ofs;
