Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next

[~andy/linux] / fs / jfs / jfs_acl.h

diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h
index f9285c4900fa5410f82af317360e1028f4a05e6f..ad84fe50ca9e897362caa12101d63a590b56073f 100644 (file)
--- a/fs/jfs/jfs_acl.h
+++ b/fs/jfs/jfs_acl.h
@@ -20,7 +20,7 @@
 
 #ifdef CONFIG_JFS_POSIX_ACL
 
-int jfs_check_acl(struct inode *, int, unsigned int flags);
+struct posix_acl *jfs_get_acl(struct inode *inode, int type);
 int jfs_init_acl(tid_t, struct inode *, struct inode *);
 int jfs_acl_chmod(struct inode *inode);