diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-12 10:11:42 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 21:54:35 +0100 |
| commit | a528bc87841d958bbd394abc9266aee9cdf45cb8 (patch) | |
| tree | 8d2d654a564e10aba023ae0a793357d3de5559fe /arch/arm/plat-mxc/devices/platform-flexcan.c | |
| parent | ARM: mx3: use an MX35 constant in imx35 only code (diff) | |
| download | linux-a528bc87841d958bbd394abc9266aee9cdf45cb8.tar.xz linux-a528bc87841d958bbd394abc9266aee9cdf45cb8.zip | |
ARM: mx3: introduce SOC_IMX31 and SOC_IMX35
Additionally convert some known to be good usages to the new
names.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-flexcan.c')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-flexcan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-flexcan.c b/arch/arm/plat-mxc/devices/platform-flexcan.c index f10db6f62baa..4e8497af2eb1 100644 --- a/arch/arm/plat-mxc/devices/platform-flexcan.c +++ b/arch/arm/plat-mxc/devices/platform-flexcan.c @@ -28,14 +28,14 @@ const struct imx_flexcan_data imx25_flexcan_data[] __initconst = { }; #endif /* ifdef CONFIG_SOC_IMX25 */ -#ifdef CONFIG_ARCH_MX35 +#ifdef CONFIG_SOC_IMX35 const struct imx_flexcan_data imx35_flexcan_data[] __initconst = { #define imx35_flexcan_data_entry(_id, _hwid) \ imx_flexcan_data_entry(MX35, _id, _hwid, SZ_16K) imx35_flexcan_data_entry(0, 1), imx35_flexcan_data_entry(1, 2), }; -#endif /* ifdef CONFIG_ARCH_MX35 */ +#endif /* ifdef CONFIG_SOC_IMX35 */ struct platform_device *__init imx_add_flexcan( const struct imx_flexcan_data *data, |