Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next

[mv-sheeva.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 6efac5fd439d93076f8f80125ee78d8526c725e5..1906840c1113cb6505a87418f7d97d5c324d7ec7 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -270,12 +270,15 @@ config SPI_PPC4xx
 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
-       depends on ARCH_PXA && EXPERIMENTAL
-       select PXA_SSP
+       depends on (ARCH_PXA || (X86_32 && PCI)) && EXPERIMENTAL
+       select PXA_SSP if ARCH_PXA
        help
-         This enables using a PXA2xx SSP port as a SPI master controller.
-         The driver can be configured to use any SSP port and additional
-         documentation can be found a Documentation/spi/pxa2xx.
+         This enables using a PXA2xx or Sodaville SSP port as a SPI master
+         controller. The driver can be configured to use any SSP port and
+         additional documentation can be found a Documentation/spi/pxa2xx.
+
+config SPI_PXA2XX_PCI
+       def_bool SPI_PXA2XX && X86_32 && PCI
 
 config SPI_S3C24XX
        tristate "Samsung S3C24XX series SPI"