Merge branch 'master'

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

diff --git a/fs/Kconfig b/fs/Kconfig
index e207be68d4cadb63eb4e90570110fb92f50449ba..62ee097776f0cede02b98c3ff935b95109a66ae1 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -323,6 +323,7 @@ config FS_POSIX_ACL
        default n
 
 source "fs/xfs/Kconfig"
+source "fs/gfs2/Kconfig"
 
 config OCFS2_FS
        tristate "OCFS2 file system support (EXPERIMENTAL)"
@@ -1817,6 +1818,7 @@ source "fs/partitions/Kconfig"
 endmenu
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu