net: Simplify the bond drivers pernet operations.

[safe/jmp/linux-2.6] / fs / btrfs / Makefile

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 99e45a5..a35eb36 100644 (file)
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -1,20 +1,10 @@
-ifneq ($(KERNELRELEASE),)
-# kbuild part of makefile
 
-obj-m  := btrfs.o
-btrfs-y := super.o
+obj-$(CONFIG_BTRFS_FS) := btrfs.o
 
-#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 \
-
-else
-
-# Normal Makefile
-
-KERNELDIR := /lib/modules/`uname -r`/build
-all::
-       $(MAKE) -C $(KERNELDIR) M=`pwd` modules
-clean::
-       rm *.o btrfs.ko
-endif
+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 \
+          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 \
+          export.o tree-log.o acl.o free-space-cache.o zlib.o \
+          compression.o delayed-ref.o relocation.o