diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-10-05 09:56:28 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-10-05 09:56:28 -0400 |
| commit | 382fc33b4a04e2dde89b4c69a6880e0c7d9761e2 (patch) | |
| tree | 9d13ef333c4e841756c45bf29600ceac28e3f85e /drivers/spi/Kconfig | |
| parent | 97541ccfb9db2bb9cd1dde6344d5834438d14bda (diff) | |
| parent | 986936d7c2f83427bb3bf1e629eba4373438e151 (diff) | |
Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 5f84b5563c2d..d654f88f4cfb 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -237,6 +237,13 @@ config SPI_OC_TINY | |||
| 237 | help | 237 | help |
| 238 | This is the driver for OpenCores tiny SPI master controller. | 238 | This is the driver for OpenCores tiny SPI master controller. |
| 239 | 239 | ||
| 240 | config SPI_OCTEON | ||
| 241 | tristate "Cavium OCTEON SPI controller" | ||
| 242 | depends on CPU_CAVIUM_OCTEON | ||
| 243 | help | ||
| 244 | SPI host driver for the hardware found on some Cavium OCTEON | ||
| 245 | SOCs. | ||
| 246 | |||
| 240 | config SPI_OMAP_UWIRE | 247 | config SPI_OMAP_UWIRE |
| 241 | tristate "OMAP1 MicroWire" | 248 | tristate "OMAP1 MicroWire" |
| 242 | depends on ARCH_OMAP1 | 249 | depends on ARCH_OMAP1 |