git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
mmc
/
core
/
sdio.c
diff --git
a/drivers/mmc/core/sdio.c
b/drivers/mmc/core/sdio.c
index 87a50f456efc080c60fcce98717b780ddc1e9bc6..4eab79e09cccacbab8b7ecf7d2ae780f9e5b9e05 100644
(file)
--- a/
drivers/mmc/core/sdio.c
+++ b/
drivers/mmc/core/sdio.c
@@
-287,7
+287,7
@@
int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
/*
* Allocate card structure.
*/
- card = mmc_alloc_card(host);
+ card = mmc_alloc_card(host
, NULL
);
if (IS_ERR(card)) {
err = PTR_ERR(card);
goto err;