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 branch 'rmobile/urgent' into rmobile-fixes-for-linus
[linux-2.6-block.git]
/
drivers
/
mmc
/
host
/
mmci.c
diff --git
a/drivers/mmc/host/mmci.c
b/drivers/mmc/host/mmci.c
index fa8dd2fda4b270d0858f144ed34abfc30a30da4a..ece03b491c7db824fe7a698353f2c14f9f0cb6d2 100644
(file)
--- a/
drivers/mmc/host/mmci.c
+++ b/
drivers/mmc/host/mmci.c
@@
-1245,6
+1245,7
@@
static int __devinit mmci_probe(struct amba_device *dev,
if (host->vcc == NULL)
mmc->ocr_avail = plat->ocr_mask;
mmc->caps = plat->capabilities;
+ mmc->caps2 = plat->capabilities2;
/*
* We can do SGIO