diff --git a/[refs] b/[refs]
index 31e1f920ae05..f74d498651f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b84e8d6eef82fcf7b1b16d92e29375b85b6549a
+refs/heads/master: 61f8c86ee8f9ca55488449db886104a0ab4e1f98
diff --git a/trunk/fs/btrfs/Makefile b/trunk/fs/btrfs/Makefile
index 48b7909ca8d1..7125716e142b 100644
--- a/trunk/fs/btrfs/Makefile
+++ b/trunk/fs/btrfs/Makefile
@@ -1,7 +1,7 @@
 ifneq ($(KERNELRELEASE),)
 # kbuild part of makefile
 
-obj-m  := btrfs.o
+obj-$(CONFIG_BTRFS_FS) := btrfs.o
 btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   file-item.o inode-item.o inode-map.o disk-io.o \
 	   transaction.o inode.o file.o tree-defrag.o \
@@ -14,7 +14,7 @@ else
 
 KERNELDIR := /lib/modules/`uname -r`/build
 all:
-	$(MAKE) -C $(KERNELDIR) M=`pwd` modules
+	$(MAKE) -C $(KERNELDIR) M=`pwd` CONFIG_BTRFS_FS=m modules
 
 modules_install:
 	$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install