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