[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-drm-fsl-dcu.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index a27002668bd36a7abb3074bfa41036ae16580b73..ca9affd676aee85b697bc7607ec99d1688679b8f 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"
@@ -1930,6 +1931,7 @@ source "fs/partitions/Kconfig"
 endmenu
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu