diff --git a/[refs] b/[refs] index 8d16aa9a65aa..b8c0c7982f8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90a2b69c14d0f0b6cbd124caf429ae9033f0615c +refs/heads/master: 19ef20143ff86c8012270c619ac7b6c3b389a8fa diff --git a/trunk/fs/ext4/xattr.h b/trunk/fs/ext4/xattr.h index 281dd8353652..1ef16520b950 100644 --- a/trunk/fs/ext4/xattr.h +++ b/trunk/fs/ext4/xattr.h @@ -122,7 +122,7 @@ ext4_xattr_put_super(struct super_block *sb) } static __init inline int -init_ext4_xattr(void) +ext4_init_xattr(void) { return 0; }