diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 16:32:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 16:32:52 -0500 |
| commit | 254ce8dc882f8d69e5d49ed4807c94a61976fb15 (patch) | |
| tree | e45883595406ab36051f30c3dd4f1aa919cea593 /drivers/mmc | |
| parent | 89de09a9ba9ce293228b1f1aa3c68b5af33a70ce (diff) | |
| parent | 896937ad5c8a1f7264b43b79c0bac2bd8d993ece (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index ceae379a4d4c..da528390acf8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
| @@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host); | |||
| 1263 | */ | 1263 | */ |
| 1264 | int mmc_resume_host(struct mmc_host *host) | 1264 | int mmc_resume_host(struct mmc_host *host) |
| 1265 | { | 1265 | { |
| 1266 | mmc_detect_change(host, 0); | 1266 | mmc_rescan(host); |
| 1267 | 1267 | ||
| 1268 | return 0; | 1268 | return 0; |
| 1269 | } | 1269 | } |