Merge branch 'master' into gfs2

[linux-2.6-block.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 1453d2d164f7c2d5a94e5da75d41dbba9d94a66e..fa64867d6ed64feb339a0b37d97a929dca723ca3 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -325,6 +325,7 @@ config FS_POSIX_ACL
        default n
 
 source "fs/xfs/Kconfig"
+source "fs/gfs2/Kconfig"
 
 config OCFS2_FS
        tristate "OCFS2 file system support"
@@ -1983,6 +1984,7 @@ endmenu
 endif
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu