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-imx-dma.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-imx-dma.c')
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index 02d989018059..cbafd9311d0d 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c | |||
@@ -39,10 +39,10 @@ struct imx_imx_sdma_data { | |||
39 | }, \ | 39 | }, \ |
40 | } | 40 | } |
41 | 41 | ||
42 | #ifdef CONFIG_ARCH_MX25 | 42 | #ifdef CONFIG_SOC_IMX25 |
43 | const struct imx_imx_sdma_data imx25_imx_sdma_data __initconst = | 43 | const struct imx_imx_sdma_data imx25_imx_sdma_data __initconst = |
44 | imx_imx_sdma_data_entry_single(MX25, 1, "imx25", 0); | 44 | imx_imx_sdma_data_entry_single(MX25, 1, "imx25", 0); |
45 | #endif /* ifdef CONFIG_ARCH_MX25 */ | 45 | #endif /* ifdef CONFIG_SOC_IMX25 */ |
46 | 46 | ||
47 | #ifdef CONFIG_ARCH_MX31 | 47 | #ifdef CONFIG_ARCH_MX31 |
48 | struct imx_imx_sdma_data imx31_imx_sdma_data __initdata = | 48 | struct imx_imx_sdma_data imx31_imx_sdma_data __initdata = |
@@ -94,7 +94,7 @@ static int __init imxXX_add_imx_dma(void) | |||
94 | else | 94 | else |
95 | #endif | 95 | #endif |
96 | 96 | ||
97 | #if defined(CONFIG_ARCH_MX25) | 97 | #if defined(CONFIG_SOC_IMX25) |
98 | if (cpu_is_mx25()) | 98 | if (cpu_is_mx25()) |
99 | ret = imx_add_imx_sdma(&imx25_imx_sdma_data); | 99 | ret = imx_add_imx_sdma(&imx25_imx_sdma_data); |
100 | else | 100 | else |