projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap2
/
hsmmc.c
diff --git
a/arch/arm/mach-omap2/hsmmc.c
b/arch/arm/mach-omap2/hsmmc.c
index 8121720e942ffdb10d14cd6fdde29aa691f7446e..100db6217f39984428ba49df988df65c2307f936 100644
(file)
--- a/
arch/arm/mach-omap2/hsmmc.c
+++ b/
arch/arm/mach-omap2/hsmmc.c
@@
-316,6
+316,7
@@
static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
mmc->slots[0].pm_caps = c->pm_caps;
mmc->slots[0].internal_clock = !c->ext_clock;
mmc->dma_mask = 0xffffffff;
+ mmc->max_freq = c->max_freq;
if (cpu_is_omap44xx())
mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
else