Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[linux-2.6.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c712f53cd5c9ff2e4dc927e0cefaf850f8f3ff71..f55eb0107336b0a66ca8f68dd41b9a3752d3bb3a 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -155,9 +155,6 @@ config SPI_MPC8xxx
          This enables using the Freescale MPC8xxx SPI controllers in master
          mode.
 
          This enables using the Freescale MPC8xxx SPI controllers in master
          mode.
 

-         This driver uses a simple set of shift registers for data (opposed
-         to the CPM based descriptor model).
-

 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
        depends on ARCH_OMAP1
 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
        depends on ARCH_OMAP1