applied patch 14-sparse-fix--remove-unused.diff

[yaffs2.git] / yaffs_fs.c

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 99d082524d86a154652d3f4006c3245683724880..ca7839136474a7dee097387f6059179415c9e4f5 100644 (file)
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -30,11 +30,10 @@
  */
 
 
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.15 2005-07-29 23:51:18 luc Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.18 2005-07-31 04:09:26 marty Exp $";
 extern const char *yaffs_guts_c_version;
 
 
-
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -192,7 +191,7 @@ static struct inode_operations yaffs_file_inode_operations = {
        .setattr        = yaffs_setattr,
 };
 
-struct inode_operations yaffs_symlink_inode_operations = {     
+static struct inode_operations yaffs_symlink_inode_operations = {      
        .readlink       = yaffs_readlink,
        .follow_link    = yaffs_follow_link,
        .setattr        = yaffs_setattr,
@@ -1406,7 +1405,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam
        }
        else
        {       
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#if defined(CONFIG_YAFFS_MTD_ENABLED) || defined(CONFIG_YAFFS2_MTD_ENABLED)
                struct mtd_info *mtd;
                
                T(YAFFS_TRACE_ALWAYS,("yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
@@ -1745,7 +1744,6 @@ static DECLARE_FSTYPE(yaffs2_ram_fs_type, "yaffs2ram", yaffs2_ram_read_super, FS
 
 
 static struct proc_dir_entry *my_proc_entry;
-static struct proc_dir_entry *my_proc_ram_write_entry;
 
 static char * yaffs_dump_dev(char *buf,yaffs_Device *dev)
 {