spi: omap2_mcspi handles omap3 too

This adds driver OMAP SPI specific changes to support OMAP 3430

Signed-off-by: Girish S G <girishsg@ti.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 69e28ed..d810789 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -144,10 +144,10 @@ config SPI_OMAP_UWIRE
          This hooks up to the MicroWire controller on OMAP1 chips.
 
 config SPI_OMAP24XX
-       tristate "McSPI driver for OMAP24xx"
-       depends on SPI_MASTER && ARCH_OMAP24XX
+       tristate "McSPI driver for OMAP24xx/OMAP34xx"
+       depends on SPI_MASTER && (ARCH_OMAP24XX || ARCH_OMAP34XX)
        help
-         SPI master controller for OMAP24xx Multichannel SPI
+         SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
          (McSPI) modules.
 
 config SPI_PXA2XX

diff --cc drivers/spi/omap2_mcspi.c
Simple merge