Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git...

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 561a832417b8968195638aba58edbfe3edd988e7..3f9a47ec67dc814764bbee0d22bdd03f7680400a 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -332,8 +332,7 @@ config SPI_STMP3XXX
 
 config SPI_TEGRA
        tristate "Nvidia Tegra SPI controller"
-       depends on ARCH_TEGRA
-       select TEGRA_SYSTEM_DMA
+       depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA
        help
          SPI driver for NVidia Tegra SoCs