summaryrefslogtreecommitdiffstats
path: root/fs/ubifs/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-06 09:39:13 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-06 09:39:13 +0100
commit17fa87fe5a5141d3c082c5c91e950aca9e0ec701 (patch)
tree5aea2ff6b9b16b49585684c5f2ce404fe444a9ba /fs/ubifs/Kconfig
parent3b28f4f2c2c7fcb6770cdfe5e8cd284ee1bc9783 (diff)
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff)
downloadlinux-17fa87fe5a5141d3c082c5c91e950aca9e0ec701.tar.bz2
Merge 4.10-rc7 into char-misc-next
We want the hv and other fixes in here as well to handle merge and testing issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ubifs/Kconfig')
-rw-r--r--fs/ubifs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index 0a908ae7af13..b0d0623c83ed 100644
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -53,7 +53,7 @@ config UBIFS_ATIME_SUPPORT
config UBIFS_FS_ENCRYPTION
bool "UBIFS Encryption"
- depends on UBIFS_FS
+ depends on UBIFS_FS && BLOCK
select FS_ENCRYPTION
default n
help