projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-dm
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
omap_mmc.h
diff --git
a/arch/arm/include/asm/omap_mmc.h
b/arch/arm/include/asm/omap_mmc.h
index 617e22fa52d49a57bbfe95538fde57fbe62be05c..b69d0731e1f86a1fb8da301f1541fc570ae3ae53 100644
(file)
--- a/
arch/arm/include/asm/omap_mmc.h
+++ b/
arch/arm/include/asm/omap_mmc.h
@@
-26,6
+26,9
@@
#define OMAP_MMC_H_
struct hsmmc {
#define OMAP_MMC_H_
struct hsmmc {
+#ifdef CONFIG_DM_MMC
+ unsigned char res0[0x100];
+#endif
unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */
unsigned int sysstatus; /* 0x14 */
unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */
unsigned int sysstatus; /* 0x14 */