From 2465ead1bc0cab440a529855a0d05f39435d52e3 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 10 Jun 2008 10:20:57 -0400
Subject: [PATCH] --- yaml --- r: 128791 b: refs/heads/master c:
 95c9eb178b96474e9d896f20f982818c5f2ceaa0 h: refs/heads/master i:   128789:
 773b19b499ce9d98df8fbfb6fbc78a2006260890   128787:
 b919a2a48c9b9ccaaed1cd0409cc31d8dcdb3fac   128783:
 04727b1a65cdfceae41c01c3d0f05b53f0f99151 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/btrfs/Makefile | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 949a62c9f418..6c6727c57d2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bf13c0cc833bf5ba013d6aa60379484bf48c4e6
+refs/heads/master: 95c9eb178b96474e9d896f20f982818c5f2ceaa0
diff --git a/trunk/fs/btrfs/Makefile b/trunk/fs/btrfs/Makefile
index 5ac6f2946c21..e5fc3cfea0ab 100644
--- a/trunk/fs/btrfs/Makefile
+++ b/trunk/fs/btrfs/Makefile
@@ -8,13 +8,7 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
 	   extent_io.o volumes.o
 
-ifeq ($(CONFIG_FS_POSIX_ACL),y)
-btrfs-y += acl.o
-endif
-#btrfs-y := ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
-#	  root-tree.o dir-item.o hash.o file-item.o inode-item.o \
-#	  inode-map.o \
-
+btrfs-$(CONFIG_FS_POSIX_ACL)	+= acl.o
 else
 
 # Normal Makefile