aboutsummaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 20:43:11 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 20:43:11 -0800
commit29552b1462799afbe02af035b243e97579d63350 (patch)
tree42ad1639678a1bc8064f690494f62497bc48d318 /fs/Makefile
parent6c59f9d9fb95934bf3d7d64249b338ce79953b5b (diff)
parent51e7a5987058c6b4d0c1337587f2ec0c34ffa708 (diff)
downloadlinux-29552b1462799afbe02af035b243e97579d63350.tar.gz
Merge http://oss.oracle.com/git/ocfs2
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile
index 4c26557590780a..73676111ebbe76 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -101,3 +101,5 @@ obj-$(CONFIG_BEFS_FS) += befs/
obj-$(CONFIG_HOSTFS) += hostfs/
obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/
+obj-$(CONFIG_CONFIGFS_FS) += configfs/
+obj-$(CONFIG_OCFS2_FS) += ocfs2/