Commit 254ce8dc authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

parents 89de09a9 896937ad
...@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host); ...@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
*/ */
int mmc_resume_host(struct mmc_host *host) int mmc_resume_host(struct mmc_host *host)
{ {
mmc_detect_change(host, 0); mmc_rescan(host);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment