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

Linus Torvalds · Linus Torvalds · commit 254ce8dc882f · 2005-11-07T13:32:52.000-08:00
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-	mmc_detect_change(host, 0);
+	mmc_rescan(host);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);`
`1263`	`1263`	`*/`
`1264`	`1264`	`int mmc_resume_host(struct mmc_host *host)`
`1265`	`1265`	`{`
`1266`		`- mmc_detect_change(host, 0);`
	`1266`	`+ mmc_rescan(host);`
`1267`	`1267`
`1268`	`1268`	`return 0;`
`1269`	`1269`	`}`