From: Linus Torvalds Date: Sat, 13 Jun 2020 20:29:16 +0000 (-0700) Subject: Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... X-Git-Tag: v5.15~3565 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6adc19fd13f11883c44df67b551cf8201e6bba1d;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'kbuild-v5.8-2' of git://git./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 --- 6adc19fd13f11883c44df67b551cf8201e6bba1d diff --cc drivers/staging/media/atomisp/Kconfig index f75765c,ba2855f..fea06cb --- a/drivers/staging/media/atomisp/Kconfig +++ b/drivers/staging/media/atomisp/Kconfig @@@ -12,10 -11,9 +12,10 @@@ menuconfig INTEL_ATOMIS config VIDEO_ATOMISP tristate "Intel Atom Image Signal Processor Driver" depends on VIDEO_V4L2 && INTEL_ATOMISP + depends on PMIC_OPREGION select IOSF_MBI select VIDEOBUF_VMALLOC - ---help--- + help Say Y here if your platform supports Intel Atom SoC camera imaging subsystem. To compile this driver as a module, choose M here: the diff --cc drivers/staging/media/atomisp/i2c/Kconfig index 69f325c,96f33a4..7c7f0fc --- a/drivers/staging/media/atomisp/i2c/Kconfig +++ b/drivers/staging/media/atomisp/i2c/Kconfig @@@ -55,10 -54,10 +55,10 @@@ config VIDEO_ATOMISP_GC031 tristate "GC0310 sensor support" depends on ACPI depends on I2C && VIDEO_V4L2 - ---help--- + help This is a Video4Linux2 sensor-level driver for the Galaxycore GC0310 0.3MP sensor. - + config VIDEO_ATOMISP_OV2680 tristate "Omnivision OV2680 sensor support" depends on ACPI