diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 08:39:29 +0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 08:39:29 +0400 |
| commit | e583685e998e52ebbf31fadf7d8470ae69951660 (patch) | |
| tree | 8ee4c2fdf2634427e259b26d7c359ac2baeceb7b /drivers/spi/Kconfig | |
| parent | 178db7d30f94707efca1a189753c105ef69942ed (diff) | |
| parent | 2b246283277862c4866a005852af5c70fd581824 (diff) | |
| download | linux-e583685e998e52ebbf31fadf7d8470ae69951660.tar.xz | |
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 serial port. config SPI_TOPCLIFF_PCH - tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH SPI controller" + tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI" depends on PCI help SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus used in some x86 embedded processors. - This driver also supports the ML7213, a companion chip for the - Atom E6xx series and compatible with the Intel EG20T PCH. + This driver also supports the ML7213/ML7223/ML7831, a companion chip + for the Atom E6xx series and compatible with the Intel EG20T PCH. config SPI_TXX9 tristate "Toshiba TXx9 SPI controller" |