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

[linux-block.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 0e7da7bb5d9351756f691e4ced2e0df2c56a23f6..d4bf8caad8d0827e627fb995b1db4e189d2142e3 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -43,6 +43,7 @@ source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 source "fs/ocfs2/Kconfig"
 source "fs/btrfs/Kconfig"
+source "fs/nilfs2/Kconfig"
 
 endif # BLOCK
 
@@ -108,6 +109,7 @@ source "fs/sysfs/Kconfig"
 
 config TMPFS
        bool "Virtual memory file system support (former shm fs)"
+       depends on SHMEM
        help
          Tmpfs is a file system which keeps all files in virtual memory.
 
@@ -186,7 +188,6 @@ source "fs/romfs/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/exofs/Kconfig"
-source "fs/nilfs2/Kconfig"
 
 endif # MISC_FILESYSTEMS