Merge branch 'master'

[mv-sheeva.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index f9b5842c8d2de67e6f9258f65fad1fc6207b9242..563a59e5e694db6b3fb2f217ba4dfe27df563cd1 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)"
@@ -1824,6 +1825,7 @@ source "fs/partitions/Kconfig"
 endmenu
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu