ubifs: CONFIG_UBIFS_FS_AUTHENTICATION should depend on UBIFS_FS

Instead of adding yet another dependency on UBIFS_FS, wrap the whole
block of ubifs config options in a single "if UBIFS_FS".

Fixes: d8a22773a12c6d78 ("ubifs: Enable authentication support")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index 529856fbccd0ee5f6559519a3d9db12cf932a775..3ee613361f4eeded77b1814c0cc6fdc0811fc241 100644 (file)
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -12,9 +12,10 @@ config UBIFS_FS
        help
          UBIFS is a file system for flash devices which works on top of UBI.
 
+if UBIFS_FS
+
 config UBIFS_FS_ADVANCED_COMPR
        bool "Advanced compression options"
-       depends on UBIFS_FS
        help
          This option allows to explicitly choose which compressions, if any,
          are enabled in UBIFS. Removing compressors means inability to read
@@ -24,7 +25,6 @@ config UBIFS_FS_ADVANCED_COMPR
 
 config UBIFS_FS_LZO
        bool "LZO compression support" if UBIFS_FS_ADVANCED_COMPR
-       depends on UBIFS_FS
        default y
        help
           LZO compressor is generally faster than zlib but compresses worse.
@@ -32,14 +32,12 @@ config UBIFS_FS_LZO
 
 config UBIFS_FS_ZLIB
        bool "ZLIB compression support" if UBIFS_FS_ADVANCED_COMPR
-       depends on UBIFS_FS
        default y
        help
          Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
 
 config UBIFS_ATIME_SUPPORT
-       bool "Access time support" if UBIFS_FS
-       depends on UBIFS_FS
+       bool "Access time support"
        default n
        help
          Originally UBIFS did not support atime, because it looked like a bad idea due
@@ -54,7 +52,6 @@ config UBIFS_ATIME_SUPPORT
 
 config UBIFS_FS_XATTR
        bool "UBIFS XATTR support"
-       depends on UBIFS_FS
        default y
        help
          Saying Y here includes support for extended attributes (xattrs).
@@ -65,7 +62,7 @@ config UBIFS_FS_XATTR
 
 config UBIFS_FS_ENCRYPTION
        bool "UBIFS Encryption"
-       depends on UBIFS_FS && UBIFS_FS_XATTR && BLOCK
+       depends on UBIFS_FS_XATTR && BLOCK
        select FS_ENCRYPTION
        default n
        help
@@ -76,7 +73,7 @@ config UBIFS_FS_ENCRYPTION
 
 config UBIFS_FS_SECURITY
        bool "UBIFS Security Labels"
-       depends on UBIFS_FS && UBIFS_FS_XATTR
+       depends on UBIFS_FS_XATTR
        default y
        help
          Security labels provide an access control facility to support Linux
@@ -96,3 +93,5 @@ config UBIFS_FS_AUTHENTICATION
          If you say yes here you should also select a hashing algorithm such as
          sha256, these are not selected automatically since there are many
          different options.
+
+endif # UBIFS_FS