From 75080cc331e91b82f8b0f2273c0803045659ab15 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 15 Mar 2022 07:04:01 +0100 Subject: [PATCH] media: spi: Kconfig: Place SPI drivers on a single menu It makes no sense to have two menus for SPI drivers, each one with a single driver. Merge them and keep the Kconfig sorted. Suggested-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/spi/Kconfig | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index 01e4e6cce027..4656afae5bb4 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -1,11 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-only -if VIDEO_DEV +if VIDEO_DEV && SPI comment "SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'" depends on MEDIA_HIDE_ANCILLARY_SUBDRV && SPI -menu "SPI helper chips" - visible if !MEDIA_HIDE_ANCILLARY_SUBDRV +menu "Media SPI Adapters" + +config CXD2880_SPI_DRV + tristate "Sony CXD2880 SPI support" + depends on DVB_CORE && SPI + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Choose if you would like to have SPI interface support for Sony CXD2880. config VIDEO_GS1662 tristate "Gennum Serializers video" @@ -18,17 +24,3 @@ config VIDEO_GS1662 endmenu endif - -if SPI -menu "Media SPI Adapters" - -config CXD2880_SPI_DRV - tristate "Sony CXD2880 SPI support" - depends on DVB_CORE && SPI - default m if !MEDIA_SUBDRV_AUTOSELECT - help - Choose if you would like to have SPI interface support for Sony CXD2880. - -endmenu - -endif