git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
devices-imx51.h
diff --git
a/arch/arm/mach-mx5/devices-imx51.h
b/arch/arm/mach-mx5/devices-imx51.h
index
8c50cb5
..
6302e46
100644
(file)
--- a/
arch/arm/mach-mx5/devices-imx51.h
+++ b/
arch/arm/mach-mx5/devices-imx51.h
@@
-31,6
+31,11
@@
extern const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst;
#define imx51_add_mxc_nand(pdata) \
imx_add_mxc_nand(&imx51_mxc_nand_data, pdata)
#define imx51_add_mxc_nand(pdata) \
imx_add_mxc_nand(&imx51_mxc_nand_data, pdata)
+extern const struct imx_sdhci_esdhc_imx_data
+imx51_sdhci_esdhc_imx_data[] __initconst;
+#define imx51_add_sdhci_esdhc_imx(id, pdata) \
+ imx_add_sdhci_esdhc_imx(&imx51_sdhci_esdhc_imx_data[id], pdata)
+
extern const struct imx_spi_imx_data imx51_cspi_data __initconst;
#define imx51_add_cspi(pdata) \
imx_add_spi_imx(&imx51_cspi_data, pdata)
extern const struct imx_spi_imx_data imx51_cspi_data __initconst;
#define imx51_add_cspi(pdata) \
imx_add_spi_imx(&imx51_cspi_data, pdata)
@@
-39,6
+44,6
@@
extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
#define imx51_add_ecspi(id, pdata) \
imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
#define imx51_add_ecspi(id, pdata) \
imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
-extern const struct imx_
esdhc_imx_data imx51_esdhc
_data[] __initconst;
-#define imx51_add_
esdhc(id, pdata)
\
- imx_add_
esdhc(&imx51_esdhc_data[id], pdata
)
+extern const struct imx_
imx2_wdt_data imx51_imx2_wdt
_data[] __initconst;
+#define imx51_add_
imx2_wdt(id, pdata)
\
+ imx_add_
imx2_wdt(&imx51_imx2_wdt_data[id]
)