Merge remote-tracking branches 'spi/topic/fsl-lpspi', 'spi/topic/imx', 'spi/topic...

[mirror_ubuntu-artful-kernel.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 91ae18035b6b27a2a56beb3e01f8095aca0d27ca..19544ed5558515ab0784fe97796db4efa0c201ca 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -67,6 +67,13 @@ config SPI_ATH79
          This enables support for the SPI controller present on the
          Atheros AR71XX/AR724X/AR913X SoCs.
 
+config SPI_ARMADA_3700
+       tristate "Marvell Armada 3700 SPI Controller"
+       depends on (ARCH_MVEBU && OF) || COMPILE_TEST
+       help
+         This enables support for the SPI controller present on the
+         Marvell Armada 3700 SoCs.
+
 config SPI_ATMEL
        tristate "Atmel SPI Controller"
        depends on HAS_DMA
@@ -379,7 +386,6 @@ config SPI_FSL_DSPI
 config SPI_FSL_ESPI
        tristate "Freescale eSPI controller"
        depends on FSL_SOC
-       select SPI_FSL_LIB
        help
          This enables using the Freescale eSPI controllers in master mode.
          From MPC8536, 85xx platform uses the controller, and all P10xx,