Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 4b9eec68fad6b84bca9c2f5f6f397f0e9be79c45..78f9fd02c1b27c3ebf0753e1d9a995212b96ba48 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -329,6 +329,13 @@ config SPI_STMP3XXX
        help
          SPI driver for Freescale STMP37xx/378x SoC SSP interface
 
+config SPI_TEGRA
+       tristate "Nvidia Tegra SPI controller"
+       depends on ARCH_TEGRA
+       select TEGRA_SYSTEM_DMA
+       help
+         SPI driver for NVidia Tegra SoCs
+
 config SPI_TOPCLIFF_PCH
        tristate "Topcliff PCH SPI Controller"
        depends on PCI