diff --git a/[refs] b/[refs]
index 698c6cbc61c9..ef79ca2886a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ed74f2dba6ebf9f30b80554290bfc73cc3ef083
+refs/heads/master: 49cf6f4529b7945ef51b8e39f0bac630726f8c96
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 0242c8babae9..e0a64328080c 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -344,7 +344,9 @@ static int btrfs_fill_super(struct super_block *sb,
 	sb->s_export_op = &btrfs_export_ops;
 	sb->s_xattr = btrfs_xattr_handlers;
 	sb->s_time_gran = 1;
+#ifdef CONFIG_BTRFS_POSIX_ACL
 	sb->s_flags |= MS_POSIXACL;
+#endif
 
 	tree_root = open_ctree(sb, fs_devices, (char *)data);