Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[uclinux-h8/linux.git] / include / linux / security.h

diff --git a/include/linux/security.h b/include/linux/security.h
index b10e7af..ba96471 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2108,7 +2108,7 @@ static inline int security_dentry_init_security(struct dentry *dentry,
 static inline int security_inode_init_security(struct inode *inode,
                                                struct inode *dir,
                                                const struct qstr *qstr,
-                                               const initxattrs initxattrs,
+                                               const initxattrs xattrs,
                                                void *fs_data)
 {
        return 0;