summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/devices-imx25.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 21:03:33 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 21:59:51 +0100
commit124bf94a9f9b52341562628cd56b252e7d820ee8 (patch)
tree73aa0be3bc6229ac63e12fe92e7b4f206d77bb5b /arch/arm/mach-imx/devices-imx25.h
parentARM: mx3/mx35_3ds: Add watchdog support (diff)
downloadlinux-124bf94a9f9b52341562628cd56b252e7d820ee8.tar.xz
linux-124bf94a9f9b52341562628cd56b252e7d820ee8.zip
ARM: imx: fix name for functions adding sdhci-esdhc-imx devices
and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/devices-imx25.h')
-rw-r--r--arch/arm/mach-imx/devices-imx25.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/devices-imx25.h b/arch/arm/mach-imx/devices-imx25.h
index 953e1ce5334f..760e66c57c1b 100644
--- a/arch/arm/mach-imx/devices-imx25.h
+++ b/arch/arm/mach-imx/devices-imx25.h
@@ -74,13 +74,14 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;
#define imx25_add_mxc_nand(pdata) \
imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
+extern const struct imx_sdhci_esdhc_imx_data
+imx25_sdhci_esdhc_imx_data[] __initconst;
+#define imx25_add_sdhci_esdhc_imx(id, pdata) \
+ imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)
+
extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
#define imx25_add_spi_imx(id, pdata) \
imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
#define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata)
#define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
#define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)
-
-extern const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst;
-#define imx25_add_esdhc(id, pdata) \
- imx_add_esdhc(&imx25_esdhc_data[id], pdata)