From fe8afeb4b589132ff111feb39ade6848a1b68898 Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Fri, 26 Jan 2024 18:49:42 +0700 Subject: [PATCH 0868/1002] drm/rp1: depends on, instead of select, MFD_RP1 According to kconfig-language.txt [1], select should be used only for "non-visible symbols ... and for symbols with no dependencies". Since MFD_RP1 both is visible and has a dependency, "select" should not be used and "depends on" should be used instead. In particular, this fixes the build of this kernel tree on NixOS, where its kernel config system will try to answer 'M' to as many config as possible. [1] https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html Signed-off-by: Ratchanan Srirattanamet --- drivers/gpu/drm/rp1/rp1-dpi/Kconfig | 3 +-- drivers/gpu/drm/rp1/rp1-dsi/Kconfig | 3 +-- drivers/gpu/drm/rp1/rp1-vec/Kconfig | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rp1/rp1-dpi/Kconfig b/drivers/gpu/drm/rp1/rp1-dpi/Kconfig index 5e9dd76d17d5..72c72709a5ce 100644 --- a/drivers/gpu/drm/rp1/rp1-dpi/Kconfig +++ b/drivers/gpu/drm/rp1/rp1-dpi/Kconfig @@ -1,8 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_RP1_DPI tristate "DRM Support for RP1 DPI" - depends on DRM - select MFD_RP1 + depends on DRM && MFD_RP1 select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER select DRM_VRAM_HELPER diff --git a/drivers/gpu/drm/rp1/rp1-dsi/Kconfig b/drivers/gpu/drm/rp1/rp1-dsi/Kconfig index 5b4970586ca7..80c57bc48792 100644 --- a/drivers/gpu/drm/rp1/rp1-dsi/Kconfig +++ b/drivers/gpu/drm/rp1/rp1-dsi/Kconfig @@ -1,8 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_RP1_DSI tristate "DRM Support for RP1 DSI" - depends on DRM - select MFD_RP1 + depends on DRM && MFD_RP1 select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI diff --git a/drivers/gpu/drm/rp1/rp1-vec/Kconfig b/drivers/gpu/drm/rp1/rp1-vec/Kconfig index 55ea3daa0e91..f646c01af5ae 100644 --- a/drivers/gpu/drm/rp1/rp1-vec/Kconfig +++ b/drivers/gpu/drm/rp1/rp1-vec/Kconfig @@ -1,8 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_RP1_VEC tristate "DRM Support for RP1 VEC" - depends on DRM - select MFD_RP1 + depends on DRM && MFD_RP1 select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER select DRM_VRAM_HELPER -- 2.44.0