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 branch 'u-boot-imx/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-davinci
/
sdmmc_defs.h
diff --git
a/arch/arm/include/asm/arch-davinci/sdmmc_defs.h
b/arch/arm/include/asm/arch-davinci/sdmmc_defs.h
index 3e9e6065c770e70827516998e3cc912c6025e7c8..9aa3f4ab279111ae5aa2b3379bfa08747668be2d 100644
(file)
--- a/
arch/arm/include/asm/arch-davinci/sdmmc_defs.h
+++ b/
arch/arm/include/asm/arch-davinci/sdmmc_defs.h
@@
-151,6
+151,7
@@
struct davinci_mmc {
uint host_caps; /* Host capabilities */
uint voltages; /* Host supported voltages */
uint version; /* MMC Controller version */
+ struct mmc_config cfg;
};
enum {