summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/devices/platform-imx-fb.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-11 18:35:01 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 21:54:34 +0100
commit972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch)
treee62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/devices/platform-imx-fb.c
parent36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff)
downloadblackbird-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-imx-fb.c')
-rw-r--r--arch/arm/plat-mxc/devices/platform-imx-fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-fb.c b/arch/arm/plat-mxc/devices/platform-imx-fb.c
index f228ba6573e1..6100a7d824dd 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-fb.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-fb.c
@@ -21,10 +21,10 @@ const struct imx_imx_fb_data imx21_imx_fb_data __initconst =
imx_imx_fb_data_entry_single(MX21, SZ_4K);
#endif /* ifdef CONFIG_SOC_IMX21 */
-#ifdef CONFIG_ARCH_MX25
+#ifdef CONFIG_SOC_IMX25
const struct imx_imx_fb_data imx25_imx_fb_data __initconst =
imx_imx_fb_data_entry_single(MX25, SZ_16K);
-#endif
+#endif /* ifdef CONFIG_SOC_IMX25 */
#ifdef CONFIG_SOC_IMX27
const struct imx_imx_fb_data imx27_imx_fb_data __initconst =
OpenPOWER on IntegriCloud