Merge remote-tracking branches 'spi/topic/lp8841', 'spi/topic/msg', 'spi/topic/pl022...

[cascardo/linux.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 77d3202..c2a0404 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -294,6 +294,16 @@ config SPI_LM70_LLP
          which interfaces to an LM70 temperature sensor using
          a parallel port.
 
+config SPI_LP8841_RTC
+       tristate "ICP DAS LP-8841 SPI Controller for RTC"
+       depends on MACH_PXA27X_DT || COMPILE_TEST
+       help
+         This driver provides an SPI master device to drive Maxim
+         DS-1302 real time clock.
+
+         Say N here unless you plan to run the kernel on an ICP DAS
+         LP-8x4x industrial computer.
+
 config SPI_MPC52xx
        tristate "Freescale MPC52xx SPI (non-PSC) controller support"
        depends on PPC_MPC52xx
@@ -445,10 +455,6 @@ config SPI_PPC4xx
        help
          This selects a driver for the PPC4xx SPI Controller.
 
-config SPI_PXA2XX_DMA
-       def_bool y
-       depends on SPI_PXA2XX
-
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
        depends on (ARCH_PXA || PCI || ACPI)