diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /drivers/spi | |
| parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
| parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) | |
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 | |||
| 161 | def_bool y if SOC_IMX21 || SOC_IMX27 | 161 | def_bool y if SOC_IMX21 || SOC_IMX27 |
| 162 | 162 | ||
| 163 | config SPI_IMX_VER_0_4 | 163 | config SPI_IMX_VER_0_4 |
| 164 | def_bool y if ARCH_MX31 | 164 | def_bool y if SOC_IMX31 |
| 165 | 165 | ||
| 166 | config SPI_IMX_VER_0_7 | 166 | config SPI_IMX_VER_0_7 |
| 167 | def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53 | 167 | def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53 |
| 168 | 168 | ||
| 169 | config SPI_IMX_VER_2_3 | 169 | config SPI_IMX_VER_2_3 |
| 170 | def_bool y if ARCH_MX51 || ARCH_MX53 | 170 | def_bool y if SOC_IMX51 || SOC_IMX53 |
| 171 | 171 | ||
| 172 | config SPI_IMX | 172 | config SPI_IMX |
| 173 | tristate "Freescale i.MX SPI controllers" | 173 | tristate "Freescale i.MX SPI controllers" |