X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=d5ca95bb1eab40db0d24372f0f371e9e6909f38d;hp=99d082524d86a154652d3f4006c3245683724880;hb=399e637051f0912a625e74cb072cbc8528b054f8;hpb=58f638975518ac0b6638bf5037bda4a2b56e78af;ds=sidebyside

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 99d0825..d5ca95b 100644
--- 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.19 2005-07-31 06:47:12 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)
 {
@@ -1828,6 +1826,7 @@ static int  yaffs_proc_read(
 	return buf-page < count ? buf-page : count;
 }
 
+#ifdef CONFIG_YAFFS2_RAM_ENABLED
 static int  yaffs_proc_ram_write(
         char *page,
 	char **start,
@@ -1841,8 +1840,7 @@ static int  yaffs_proc_ram_write(
 	printk(KERN_DEBUG "yaffs write size %d\n",count);
 	return count;
 }
-
-
+#endif
 
 // Stuff to handle installation of file systems
 struct file_system_to_install