From dfa431f7fc85382e2c4d5524324c931b909066c0 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Tue, 22 Jan 2013 12:26:24 +0200 Subject: [PATCH] --- yaml --- r: 350754 b: refs/heads/master c: 2b49ebda39d66db1ae79a94c2bfec2d44f26ff94 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1aa083567839..9ddad1f0c6c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f28037d2e9ee1fe34ede6211f1cce1d38d867cb8 +refs/heads/master: 2b49ebda39d66db1ae79a94c2bfec2d44f26ff94 diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig index 2e188e1127eb..a90393d7f106 100644 --- a/trunk/drivers/spi/Kconfig +++ b/trunk/drivers/spi/Kconfig @@ -299,7 +299,7 @@ config SPI_PPC4xx config SPI_PXA2XX tristate "PXA2xx SSP SPI master" - depends on (ARCH_PXA || (X86_32 && PCI)) && EXPERIMENTAL + depends on ARCH_PXA || PCI select PXA_SSP if ARCH_PXA help This enables using a PXA2xx or Sodaville SSP port as a SPI master @@ -307,7 +307,7 @@ config SPI_PXA2XX additional documentation can be found a Documentation/spi/pxa2xx. config SPI_PXA2XX_PCI - def_bool SPI_PXA2XX && X86_32 && PCI + def_tristate SPI_PXA2XX && PCI config SPI_RSPI tristate "Renesas RSPI controller"