Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[cascardo/linux.git] / security / selinux / include / security.h

diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 44cba2e..7c54300 100644 (file)
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -136,7 +136,7 @@ int security_get_allow_unknown(void);
 #define SECURITY_FS_USE_MNTPOINT       6 /* use mountpoint labeling */
 
 int security_fs_use(const char *fstype, unsigned int *behavior,
-       u32 *sid, bool can_xattr);
+       u32 *sid);
 
 int security_genfs_sid(const char *fstype, char *name, u16 sclass,
        u32 *sid);