From 476e8a6e5e2da041d1785891d58f78c36697b4de Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sat, 19 May 2007 16:14:43 +0200
Subject: [PATCH] --- yaml --- r: 58763 b: refs/heads/master c:
 8c75deae1ab99661975da098f8b721bafbb247c4 h: refs/heads/master i:   58761:
 8ba4f1a234ab5057cb1727c7cbdd565242d0679a   58759:
 879c29b3b4d4a97f159e0cf9f5aff205567b36fb v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mmc/core/mmc.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1b1a549ed8dc..506b2920b050 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffce2e7e7060c949ccd703dacc9b3dd81b377373
+refs/heads/master: 8c75deae1ab99661975da098f8b721bafbb247c4
diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c
index e4371555160a..66f85bfa8dbb 100644
--- a/trunk/drivers/mmc/core/mmc.c
+++ b/trunk/drivers/mmc/core/mmc.c
@@ -237,7 +237,7 @@ static int mmc_read_ext_csd(struct mmc_card *card)
  * In the case of a resume, "curcard" will contain the card
  * we're trying to reinitialise.
  */
-static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
+static int mmc_init_card(struct mmc_host *host, u32 ocr,
 	struct mmc_card *oldcard)
 {
 	struct mmc_card *card;
@@ -500,7 +500,7 @@ static void mmc_resume(struct mmc_host *host)
 
 	mmc_claim_host(host);
 
-	err = mmc_sd_init_card(host, host->ocr, host->card);
+	err = mmc_init_card(host, host->ocr, host->card);
 	if (err != MMC_ERR_NONE) {
 		mmc_remove(host);
 		mmc_detach_bus(host);
@@ -559,7 +559,7 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
 	/*
 	 * Detect and init the card.
 	 */
-	err = mmc_sd_init_card(host, host->ocr, NULL);
+	err = mmc_init_card(host, host->ocr, NULL);
 	if (err != MMC_ERR_NONE)
 		goto err;