diff --git a/[refs] b/[refs]
index 681987b9f234..a9d8c6a046ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 639cb58675ce9b507eed9c3d6b3335488079b21a
+refs/heads/master: eab922ec8907b8c506e799785e7e2d16eabe50e4
diff --git a/trunk/fs/btrfs/Makefile b/trunk/fs/btrfs/Makefile
index 8213bba1de9f..3a01065d4ef1 100644
--- a/trunk/fs/btrfs/Makefile
+++ b/trunk/fs/btrfs/Makefile
@@ -7,9 +7,8 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   transaction.o bit-radix.o inode.o file.o tree-defrag.o \
 	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
 	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
-	   ref-cache.o export.o
+	   ref-cache.o acl.o export.o
 
-btrfs-$(CONFIG_FS_POSIX_ACL)	+= acl.o
 else
 
 # Normal Makefile
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index b192659b4f5f..b95147ef1c77 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -27,6 +27,8 @@
 #include "btrfs_inode.h"
 #include "xattr.h"
 
+#ifdef CONFIG_FS_POSIX_ACL
+
 static void btrfs_update_cached_acl(struct inode *inode,
 				    struct posix_acl **p_acl,
 				    struct posix_acl *acl)
@@ -329,3 +331,22 @@ struct xattr_handler btrfs_xattr_acl_access_handler = {
 	.get	= btrfs_xattr_acl_access_get,
 	.set	= btrfs_xattr_acl_access_set,
 };
+
+#else /* CONFIG_FS_POSIX_ACL */
+
+int btrfs_acl_chmod(struct inode *inode)
+{
+	return 0;
+}
+
+int btrfs_init_acl(struct inode *inode, struct inode *dir)
+{
+	return 0;
+}
+
+int btrfs_check_acl(struct inode *inode, int mask)
+{
+	return 0;
+}
+
+#endif /* CONFIG_FS_POSIX_ACL */