summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 23:29:16 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 23:29:16 +0300
commit6adc19fd13f11883c44df67b551cf8201e6bba1d (patch)
tree455e80aca7b57b17069fab252261c4dcae44374d /drivers/media
parent3df83e164f1f39c614a3f31e39164756945ae2ea (diff)
parenta7f7f6248d9740d710fd6bd190293fe5e16410ac (diff)
downloadlinux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada: - fix build rules in binderfs sample - fix build errors when Kbuild recurses to the top Makefile - covert '---help---' in Kconfig to 'help' * tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: treewide: replace '---help---' in Kconfig files with 'help' kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/cec/platform/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/cec/platform/Kconfig b/drivers/media/cec/platform/Kconfig
index 350533cd8261..b672d3142eb7 100644
--- a/drivers/media/cec/platform/Kconfig
+++ b/drivers/media/cec/platform/Kconfig
@@ -32,7 +32,7 @@ config CEC_MESON_G12A_AO
select REGMAP_MMIO
select CEC_CORE
select CEC_NOTIFIER
- ---help---
+ help
This is a driver for Amlogic Meson G12A SoCs AO CEC interface.
This driver if for the new AO-CEC module found in G12A SoCs,
usually named AO_CEC_B in documentation.