Merge branch 'master' into gfs2

[pandora-kernel.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index a503e6c..215f703 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -10,7 +10,7 @@ obj-y :=      open.o read_write.o file_table.o super.o \
                ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \
                attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
                seq_file.o xattr.o libfs.o fs-writeback.o \
-               pnode.o drop_caches.o splice.o sync.o
+               pnode.o drop_caches.o splice.o sync.o utimes.o
 
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=       buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
@@ -57,6 +57,7 @@ obj-$(CONFIG_CONFIGFS_FS)     += configfs/
 obj-y                          += devpts/
 
 obj-$(CONFIG_PROFILING)                += dcookies.o
+obj-$(CONFIG_DLM)              += dlm/
  
 # Do not add any filesystems before this line
 obj-$(CONFIG_REISERFS_FS)      += reiserfs/
@@ -109,3 +110,4 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
 obj-$(CONFIG_HPPFS)            += hppfs/
 obj-$(CONFIG_DEBUG_FS)         += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
+obj-$(CONFIG_GFS2_FS)           += gfs2/