Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[linux-2.6-omap-h63xx.git] / fs / affs / affs.h

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index a43a876742b8e3b9759c7429e475bb62f5fb7e61..1dc8438ef389591a4dc79ce9545e444189f19e79 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -1,7 +1,6 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
-#include <linux/affs_fs.h>
 #include <linux/amigaffs.h>
 
 /* AmigaOS allows file names with up to 30 characters length.
@@ -195,9 +194,9 @@ extern struct inode_operations   affs_symlink_inode_operations;
 extern const struct file_operations     affs_file_operations;
 extern const struct file_operations     affs_file_operations_ofs;
 extern const struct file_operations     affs_dir_operations;
-extern struct address_space_operations  affs_symlink_aops;
-extern struct address_space_operations  affs_aops;
-extern struct address_space_operations  affs_aops_ofs;
+extern const struct address_space_operations    affs_symlink_aops;
+extern const struct address_space_operations    affs_aops;
+extern const struct address_space_operations    affs_aops_ofs;
 
 extern struct dentry_operations         affs_dentry_operations;
 extern struct dentry_operations         affs_dentry_operations_intl;