Merge ../torvalds-2.6/

1 files changed, 33 insertions, 0 deletions

diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
new file mode 100644
index 000000000000..7d3be845a614
--- /dev/null
+++ b/fs/ocfs2/Makefile
@@ -0,0 +1,33 @@
+EXTRA_CFLAGS += -Ifs/ocfs2
+
+EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
+
+obj-$(CONFIG_OCFS2_FS) += ocfs2.o
+
+ocfs2-objs := \
+        alloc.o                 \
+        aops.o                  \
+        buffer_head_io.o        \
+        dcache.o                \
+        dir.o                   \
+        dlmglue.o               \
+        export.o                \
+        extent_map.o            \
+        file.o                  \
+        heartbeat.o             \
+        inode.o                 \
+        journal.o               \
+        localalloc.o            \
+        mmap.o                  \
+        namei.o                 \
+        slot_map.o              \
+        suballoc.o              \
+        super.o                 \
+        symlink.o               \
+        sysfile.o               \
+        uptodate.o              \
+        ver.o                   \
+        vote.o
+
+obj-$(CONFIG_OCFS2_FS) += cluster/
+obj-$(CONFIG_OCFS2_FS) += dlm/