diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
| commit | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (patch) | |
| tree | fdde7380d2584d0297898373831f26cd5208cabd /drivers/spi/Kconfig | |
| parent | 51badebdcf394cc5fd574a524b55b3f6085e5e9c (diff) | |
| parent | 6d5355998a757a16815d58da4a739b15a6efbfba (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 94058c62620a..28fce65b8594 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -133,6 +133,14 @@ config SPI_LM70_LLP | |||
| 133 | which interfaces to an LM70 temperature sensor using | 133 | which interfaces to an LM70 temperature sensor using |
| 134 | a parallel port. | 134 | a parallel port. |
| 135 | 135 | ||
| 136 | config SPI_MPC52xx | ||
| 137 | tristate "Freescale MPC52xx SPI (non-PSC) controller support" | ||
| 138 | depends on PPC_MPC52xx && SPI | ||
| 139 | select SPI_MASTER_OF | ||
| 140 | help | ||
| 141 | This drivers supports the MPC52xx SPI controller in master SPI | ||
| 142 | mode. | ||
| 143 | |||
| 136 | config SPI_MPC52xx_PSC | 144 | config SPI_MPC52xx_PSC |
| 137 | tristate "Freescale MPC52xx PSC SPI controller" | 145 | tristate "Freescale MPC52xx PSC SPI controller" |
| 138 | depends on PPC_MPC52xx && EXPERIMENTAL | 146 | depends on PPC_MPC52xx && EXPERIMENTAL |