diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-11 12:35:01 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 15:54:34 -0500 |
commit | 972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch) | |
tree | e62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/devices/platform-spi_imx.c | |
parent | 36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff) |
ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC
Some usages of ARCH_MX25 are assuming that if it is
defined the other SoCs are undefined. Use SOC_IMX25 for the save
places.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-spi_imx.c')
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-spi_imx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-spi_imx.c b/arch/arm/plat-mxc/devices/platform-spi_imx.c index e48340ec331..bf2cb477f77 100644 --- a/arch/arm/plat-mxc/devices/platform-spi_imx.c +++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c | |||
@@ -29,7 +29,7 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { | |||
29 | imx21_cspi_data_entry(1, 2), | 29 | imx21_cspi_data_entry(1, 2), |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #ifdef CONFIG_ARCH_MX25 | 32 | #ifdef CONFIG_SOC_IMX25 |
33 | const struct imx_spi_imx_data imx25_cspi_data[] __initconst = { | 33 | const struct imx_spi_imx_data imx25_cspi_data[] __initconst = { |
34 | #define imx25_cspi_data_entry(_id, _hwid) \ | 34 | #define imx25_cspi_data_entry(_id, _hwid) \ |
35 | imx_spi_imx_data_entry(MX25, CSPI, "imx25-cspi", _id, _hwid, SZ_16K) | 35 | imx_spi_imx_data_entry(MX25, CSPI, "imx25-cspi", _id, _hwid, SZ_16K) |
@@ -37,7 +37,7 @@ const struct imx_spi_imx_data imx25_cspi_data[] __initconst = { | |||
37 | imx25_cspi_data_entry(1, 2), | 37 | imx25_cspi_data_entry(1, 2), |
38 | imx25_cspi_data_entry(2, 3), | 38 | imx25_cspi_data_entry(2, 3), |
39 | }; | 39 | }; |
40 | #endif /* ifdef CONFIG_ARCH_MX25 */ | 40 | #endif /* ifdef CONFIG_SOC_IMX25 */ |
41 | 41 | ||
42 | #ifdef CONFIG_SOC_IMX27 | 42 | #ifdef CONFIG_SOC_IMX27 |
43 | const struct imx_spi_imx_data imx27_cspi_data[] __initconst = { | 43 | const struct imx_spi_imx_data imx27_cspi_data[] __initconst = { |