diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index dc17eadce..b00329096 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -4,10 +4,19 @@ config SPI
 	bool "Enable SPI driver support"
 	default y
 
+if SPI
+
+config DRIVER_SPI_ALTERA
+	bool "Altera SPI Master driver"
+	depends on NIOS2
+
+config DRIVER_SPI_ATMEL
+	bool "Atmel (AT91) SPI Master driver"
+	depends on ARCH_AT91
+
 config DRIVER_SPI_IMX
 	bool "i.MX SPI Master driver"
 	depends on ARCH_IMX
-	depends on SPI
 
 config DRIVER_SPI_IMX_0_0
 	bool
@@ -24,20 +33,10 @@ config DRIVER_SPI_IMX_2_3
 	depends on ARCH_IMX51 || ARCH_IMX53 || ARCH_IMX6
 	default y
 
-config DRIVER_SPI_ALTERA
-	bool "Altera SPI Master driver"
-	depends on NIOS2
-	depends on SPI
-
-config DRIVER_SPI_ATMEL
-	bool "Atmel (AT91) SPI Master driver"
-	depends on ARCH_AT91
-	depends on SPI
-
-
 config DRIVER_SPI_OMAP3
 	bool "OMAP3 McSPI Master driver"
 	depends on ARCH_OMAP3
-	depends on SPI
+
+endif
 
 endmenu