Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench...

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

diff --git a/fs/Kconfig b/fs/Kconfig
index 64d44efad7a5d6752ad5c867ff7d10dd0b94b1e3..5f85b5947613f4a4cfaaf42149d6658d69627799 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -177,6 +177,7 @@ source "fs/efs/Kconfig"
 source "fs/jffs2/Kconfig"
 # UBIFS File system configuration
 source "fs/ubifs/Kconfig"
+source "fs/logfs/Kconfig"
 source "fs/cramfs/Kconfig"
 source "fs/squashfs/Kconfig"
 source "fs/freevxfs/Kconfig"
@@ -234,6 +235,7 @@ config NFS_COMMON
 
 source "net/sunrpc/Kconfig"
 source "fs/smbfs/Kconfig"
+source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
 source "fs/ncpfs/Kconfig"
 source "fs/coda/Kconfig"