diff options
Diffstat (limited to 'fs/jffs2/fs.c')
-rw-r--r-- | fs/jffs2/fs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 5b7c960a0475..c91c66e5e869 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: fs.c,v 1.52 2005/02/09 09:17:40 pavlov Exp $ | 10 | * $Id: fs.c,v 1.53 2005/02/09 09:23:53 pavlov Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -450,13 +450,11 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent) | |||
450 | 450 | ||
451 | c = JFFS2_SB_INFO(sb); | 451 | c = JFFS2_SB_INFO(sb); |
452 | 452 | ||
453 | #ifndef CONFIG_JFFS2_FS_NAND | 453 | #ifndef CONFIG_JFFS2_FS_WRITEBUFFER |
454 | if (c->mtd->type == MTD_NANDFLASH) { | 454 | if (c->mtd->type == MTD_NANDFLASH) { |
455 | printk(KERN_ERR "jffs2: Cannot operate on NAND flash unless jffs2 NAND support is compiled in.\n"); | 455 | printk(KERN_ERR "jffs2: Cannot operate on NAND flash unless jffs2 NAND support is compiled in.\n"); |
456 | return -EINVAL; | 456 | return -EINVAL; |
457 | } | 457 | } |
458 | #endif | ||
459 | #ifndef CONFIG_JFFS2_FS_DATAFLASH | ||
460 | if (c->mtd->type == MTD_DATAFLASH) { | 458 | if (c->mtd->type == MTD_DATAFLASH) { |
461 | printk(KERN_ERR "jffs2: Cannot operate on DataFlash unless jffs2 DataFlash support is compiled in.\n"); | 459 | printk(KERN_ERR "jffs2: Cannot operate on DataFlash unless jffs2 DataFlash support is compiled in.\n"); |
462 | return -EINVAL; | 460 | return -EINVAL; |