1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 48b7909ca8d1..7125716e142b 100644
--- a/fs/btrfs/Makefile
+++ b/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

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 48b7909ca8d1..7125716e142b 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile
@@ -1,7 +1,7 @@
1	ifneq ($(KERNELRELEASE),)	1	ifneq ($(KERNELRELEASE),)
2	# kbuild part of makefile	2	# kbuild part of makefile
3		3
4	obj-m := btrfs.o	4	obj-$(CONFIG_BTRFS_FS) := btrfs.o
5	btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \	5	btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
6	file-item.o inode-item.o inode-map.o disk-io.o \	6	file-item.o inode-item.o inode-map.o disk-io.o \
7	transaction.o inode.o file.o tree-defrag.o \	7	transaction.o inode.o file.o tree-defrag.o \
@@ -14,7 +14,7 @@ else
14		14
15	KERNELDIR := /lib/modules/`uname -r`/build	15	KERNELDIR := /lib/modules/`uname -r`/build
16	all:	16	all:
17	$(MAKE) -C $(KERNELDIR) M=`pwd` modules	17	$(MAKE) -C $(KERNELDIR) M=`pwd` CONFIG_BTRFS_FS=m modules
18		18
19	modules_install:	19	modules_install:
20	$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install	20	$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install