From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 28 Dec 2021 19:57:37 +0000 (+0100)
Subject: tee: combine "config" and "menu" for TEE's menuconfig
X-Git-Tag: for-5.19/block-exec-2022-06-02~33^2~17^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a4b75fe8e1c15c96c4eb083e211ccbbfd56599f9;p=linux-block.git

tee: combine "config" and "menu" for TEE's menuconfig

Don't let TEE occupy two lines in menuconfig when practically no
other (sub)menu does either.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---

diff --git a/drivers/tee/Kconfig b/drivers/tee/Kconfig
index e99d840c2511..73a147202e88 100644
--- a/drivers/tee/Kconfig
+++ b/drivers/tee/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # Generic Trusted Execution Environment Configuration
-config TEE
+menuconfig TEE
 	tristate "Trusted Execution Environment support"
 	depends on HAVE_ARM_SMCCC || COMPILE_TEST || CPU_SUP_AMD
 	select CRYPTO
@@ -13,10 +13,7 @@ config TEE
 
 if TEE
 
-menu "TEE drivers"
-
 source "drivers/tee/optee/Kconfig"
 source "drivers/tee/amdtee/Kconfig"
-endmenu
 
 endif