diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-11 18:35:01 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 21:54:34 +0100 |
| commit | 972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch) | |
| tree | e62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/devices/platform-esdhc.c | |
| parent | 36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff) | |
| download | blackbird-op-linux-972cc48207450ce6aeed416ac176fe4d0482a4a3.tar.gz blackbird-op-linux-972cc48207450ce6aeed416ac176fe4d0482a4a3.zip | |
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-esdhc.c')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-esdhc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-esdhc.c b/arch/arm/plat-mxc/devices/platform-esdhc.c index 2605bfa0dfb0..87df70bc2cbc 100644 --- a/arch/arm/plat-mxc/devices/platform-esdhc.c +++ b/arch/arm/plat-mxc/devices/platform-esdhc.c @@ -20,14 +20,14 @@ #define imx_esdhc_imx_data_entry(soc, id, hwid) \ [id] = imx_esdhc_imx_data_entry_single(soc, id, hwid) -#ifdef CONFIG_ARCH_MX25 +#ifdef CONFIG_SOC_IMX25 const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst = { #define imx25_esdhc_data_entry(_id, _hwid) \ imx_esdhc_imx_data_entry(MX25, _id, _hwid) imx25_esdhc_data_entry(0, 1), imx25_esdhc_data_entry(1, 2), }; -#endif /* ifdef CONFIG_ARCH_MX25 */ +#endif /* ifdef CONFIG_SOC_IMX25 */ #ifdef CONFIG_ARCH_MX35 const struct imx_esdhc_imx_data imx35_esdhc_data[] __initconst = { |
