diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 14:53:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 14:53:29 +0100 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /drivers/spi | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
| parent | arm: imx: Zero entire imxdma structure (diff) | |
| download | linux-3afdb0f3528991de0833224f2dba60dc061e01fa.tar.xz linux-3afdb0f3528991de0833224f2dba60dc061e01fa.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'drivers/spi')
| -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 bb233a9cbad2..996cf0359385 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -161,13 +161,13 @@ config SPI_IMX_VER_0_0 def_bool y if SOC_IMX21 || SOC_IMX27 config SPI_IMX_VER_0_4 - def_bool y if ARCH_MX31 + def_bool y if SOC_IMX31 config SPI_IMX_VER_0_7 - def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53 + def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53 config SPI_IMX_VER_2_3 - def_bool y if ARCH_MX51 || ARCH_MX53 + def_bool y if SOC_IMX51 || SOC_IMX53 config SPI_IMX tristate "Freescale i.MX SPI controllers" |