commit | 254ce8dc882f8d69e5d49ed4807c94a61976fb15 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 07 13:32:52 2005 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 07 13:32:52 2005 -0800 |
tree | e45883595406ab36051f30c3dd4f1aa919cea593 | |
parent | 89de09a9ba9ce293228b1f1aa3c68b5af33a70ce [diff] | |
parent | 896937ad5c8a1f7264b43b79c0bac2bd8d993ece [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index ceae379..da52839 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c
@@ -1263,7 +1263,7 @@ */ int mmc_resume_host(struct mmc_host *host) { - mmc_detect_change(host, 0); + mmc_rescan(host); return 0; }