Merge branches 'release' and 'thermal' into release

[sfrench/cifs-2.6.git] / fs / freevxfs / vxfs_immed.c

diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c
index 4e25f3fbed86c71d7a92722ea00bfbb82711860f..8a5959a61ba9dbff4b9b713efa1f5d42da003e1f 100644 (file)
--- a/fs/freevxfs/vxfs_immed.c
+++ b/fs/freevxfs/vxfs_immed.c
@@ -48,13 +48,13 @@ static int  vxfs_immed_readpage(struct file *, struct page *);
  * Unliked all other operations we do not go through the pagecache,
  * but do all work directly on the inode.
  */
-struct inode_operations vxfs_immed_symlink_iops = {
+const struct inode_operations vxfs_immed_symlink_iops = {
        .readlink =             generic_readlink,
        .follow_link =          vxfs_immed_follow_link,
 };
 
 /*
- * Adress space operations for immed files and directories.
+ * Address space operations for immed files and directories.
  */
 const struct address_space_operations vxfs_immed_aops = {
        .readpage =             vxfs_immed_readpage,