Merge branch 'master'

[sfrench/cifs-2.6.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index e9749b0eecd8a27e5a1d09ece2eee57e63c14529..14bcce80034670922f87d5de16efeea1a4390da7 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)"
@@ -1828,6 +1829,7 @@ source "fs/partitions/Kconfig"
 endmenu
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu