diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:40:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:40:10 +0200 |
| commit | d563a6bb3d107bf62ec7cd852a142d7e93f0db79 (patch) | |
| tree | 9902cb7c599126341a8fb32e572305c04fffb9c8 /drivers/spi/Kconfig | |
| parent | 1fcb61c52bbdbbc46d132acf7dab9ad0eca433fe (diff) | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
Merge tag 'v4.1-rc5' into x86/mm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 198f96b7fb45..72b059081559 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -78,6 +78,7 @@ config SPI_ATMEL config SPI_BCM2835 tristate "BCM2835 SPI controller" depends on ARCH_BCM2835 || COMPILE_TEST + depends on GPIOLIB help This selects a driver for the Broadcom BCM2835 SPI master. @@ -302,7 +303,7 @@ config SPI_FSL_SPI config SPI_FSL_DSPI tristate "Freescale DSPI controller" select REGMAP_MMIO - depends on SOC_VF610 || COMPILE_TEST + depends on SOC_VF610 || SOC_LS1021A || COMPILE_TEST help This enables support for the Freescale DSPI controller in master mode. VF610 platform uses the controller. |