diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-04 23:39:29 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-04 23:39:29 -0500 |
| commit | e583685e998e52ebbf31fadf7d8470ae69951660 (patch) | |
| tree | 8ee4c2fdf2634427e259b26d7c359ac2baeceb7b /drivers/spi/Kconfig | |
| parent | 178db7d30f94707efca1a189753c105ef69942ed (diff) | |
| parent | 2b246283277862c4866a005852af5c70fd581824 (diff) | |
Merge branch 'spi/next' (early part) into spi/merge
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 8ba4510a9519..7587796224c8 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -346,14 +346,14 @@ config SPI_TI_SSP | |||
| 346 | serial port. | 346 | serial port. |
| 347 | 347 | ||
| 348 | config SPI_TOPCLIFF_PCH | 348 | config SPI_TOPCLIFF_PCH |
| 349 | tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH SPI controller" | 349 | tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI" |
| 350 | depends on PCI | 350 | depends on PCI |
| 351 | help | 351 | help |
| 352 | SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus | 352 | SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus |
| 353 | used in some x86 embedded processors. | 353 | used in some x86 embedded processors. |
| 354 | 354 | ||
| 355 | This driver also supports the ML7213, a companion chip for the | 355 | This driver also supports the ML7213/ML7223/ML7831, a companion chip |
| 356 | Atom E6xx series and compatible with the Intel EG20T PCH. | 356 | for the Atom E6xx series and compatible with the Intel EG20T PCH. |
| 357 | 357 | ||
| 358 | config SPI_TXX9 | 358 | config SPI_TXX9 |
| 359 | tristate "Toshiba TXx9 SPI controller" | 359 | tristate "Toshiba TXx9 SPI controller" |