diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /drivers/spi/Kconfig | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index aacc0ed25ba4..91c2f4f3af10 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -197,10 +197,10 @@ config SPI_OMAP_UWIRE | |||
| 197 | This hooks up to the MicroWire controller on OMAP1 chips. | 197 | This hooks up to the MicroWire controller on OMAP1 chips. |
| 198 | 198 | ||
| 199 | config SPI_OMAP24XX | 199 | config SPI_OMAP24XX |
| 200 | tristate "McSPI driver for OMAP24xx/OMAP34xx" | 200 | tristate "McSPI driver for OMAP" |
| 201 | depends on ARCH_OMAP2 || ARCH_OMAP3 | 201 | depends on ARCH_OMAP2PLUS |
| 202 | help | 202 | help |
| 203 | SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI | 203 | SPI master controller for OMAP24XX and later Multichannel SPI |
| 204 | (McSPI) modules. | 204 | (McSPI) modules. |
| 205 | 205 | ||
| 206 | config SPI_OMAP_100K | 206 | config SPI_OMAP_100K |