summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2/devices.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-11 16:31:49 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-24 10:05:38 +0100
commit3636a145321573f2f735e3ae69f87e0fb166abec (patch)
tree90be2285c66900ef18cc870428cc86297242cde9 /arch/arm/mach-mx2/devices.h
parentf0d3ab49110327516b7f0b6d27fd33d6fa079d6c (diff)
arm/mx2: use per-SOC nand device
The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2/devices.h')
-rw-r--r--arch/arm/mach-mx2/devices.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h
index 02e5dd20309..f15df2aaae4 100644
--- a/arch/arm/mach-mx2/devices.h
+++ b/arch/arm/mach-mx2/devices.h
@@ -15,13 +15,9 @@ extern struct platform_device mxc_uart_device5;
extern struct platform_device mxc_w1_master_device;
#ifdef CONFIG_MACH_MX21
extern struct platform_device imx21_nand_device;
-#define mxc_nand_device imx21_nand_device
#endif
#ifdef CONFIG_MACH_MX27
extern struct platform_device imx27_nand_device;
-#ifndef CONFIG_MACH_MX21
-#define mxc_nand_device imx27_nand_device
-#endif
#endif
extern struct platform_device mxc_fb_device;
extern struct platform_device mxc_fec_device;