diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /drivers/spi | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 83a185d52961..7c61251bea61 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -118,7 +118,7 @@ config SPI_GPIO | |||
| 118 | 118 | ||
| 119 | config SPI_IMX | 119 | config SPI_IMX |
| 120 | tristate "Freescale iMX SPI controller" | 120 | tristate "Freescale iMX SPI controller" |
| 121 | depends on ARCH_IMX && EXPERIMENTAL | 121 | depends on ARCH_MX1 && EXPERIMENTAL |
| 122 | help | 122 | help |
| 123 | This enables using the Freescale iMX SPI controller in master | 123 | This enables using the Freescale iMX SPI controller in master |
| 124 | mode. | 124 | mode. |