From 9edfd6c57a107c02b294dc0142bc464cf629c955 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 16 Aug 2020 11:15:46 +0200 Subject: [PATCH] ANDROID: fix up Android-specific Kconfig ---help--- strings With commit f70f74d15ca8 ("kconfig: remove '---help---' support") the "---help---" marking is no longer allowed in Kconfig files. Unfortunately some old ANDROID patches used this deprecated markings, which breaks the build. Fix this up by converting them to the correct style "help" Bug: 156285741 Bug: 146517987 Bug: 31622239 Bug: 120445368 Bug: 119769411 Bug: 129280212 Fixes: 7f62740112ef ("ANDROID: add support for vendor hooks") Fixes: 2dec8234fe73 ("ANDROID: gnss: Add command line test driver") Fixes: 611561983150 ("ANDROID: AVB error handler to invalidate vbmeta partition.") Fixes: 0ce3eb37e9ea ("ANDROID: dm-bow: Add dm-bow feature") Cc: Todd Kjos Cc: Alistair Delva Cc: David Zeuthen Cc: Paul Lawrence Signed-off-by: Greg Kroah-Hartman Change-Id: I8a503c34b5b4dac6dc3e24afbefa10223a6fd946 --- drivers/android/Kconfig | 2 +- drivers/gnss/Kconfig | 2 +- drivers/md/Kconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index ef69c871342d..32fb9e5b6195 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig @@ -57,7 +57,7 @@ config ANDROID_BINDER_IPC_SELFTEST config ANDROID_VENDOR_HOOKS bool "Android Vendor Hooks" depends on TRACEPOINTS - ---help--- + help Enable vendor hooks implemented as tracepoints Allow vendor modules to attach to tracepoint "hooks" defined via diff --git a/drivers/gnss/Kconfig b/drivers/gnss/Kconfig index 50deac3589eb..b94e210c7795 100644 --- a/drivers/gnss/Kconfig +++ b/drivers/gnss/Kconfig @@ -58,7 +58,7 @@ config GNSS_CMDLINE_SERIAL tristate "Command line test driver for GNSS" depends on SERIAL_DEV_BUS select GNSS_SERIAL - ---help--- + help Say Y here if you want to test the GNSS subsystem but do not have a way to communicate a binding through firmware such as DT or ACPI. The correct serdev device and protocol type must be specified on diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index fa08a225d73e..5c361dfc65ff 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -561,7 +561,7 @@ config DM_VERITY_VERIFY_ROOTHASH_SIG config DM_VERITY_AVB tristate "Support AVB specific verity error behavior" depends on DM_VERITY - ---help--- + help Enables Android Verified Boot platform-specific error behavior. In particular, it will modify the vbmeta partition specified on the kernel command-line when non-transient error @@ -653,7 +653,7 @@ config DM_BOW tristate "Backup block device" depends on BLK_DEV_DM select DM_BUFIO - ---help--- + help This device-mapper target takes a device and keeps a log of all changes using free blocks identified by issuing a trim command. This can then be restored by running a command line utility,