Merge branch 'devel' into for-linus

[linux-2.6-omap-h63xx.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9708e78a4d49a5215e985c3254968d51e60e28ad..b89c34e40bc2b23e5d34485f8640a28197b7a3e5 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -817,7 +817,7 @@ struct nfs_access_entry;
  */
 struct nfs_rpc_ops {
        u32     version;                /* Protocol version */
-       struct dentry_operations *dentry_ops;
+       const struct dentry_operations *dentry_ops;
        const struct inode_operations *dir_inode_ops;
        const struct inode_operations *file_inode_ops;