[PATCH 5/5] Fix-MMC-Buid-errors-with-new-merges on Sakoman's u-boot tree

1 view

Skip to first unread message

Khasim Syed Mohammed

unread,

Feb 19, 2009, 4:14:41 AM2/19/09

to beagl...@googlegroups.com

From 879b133f58f5a787b53bc6ccc30dc6561ae163ed Mon Sep 17 00:00:00 2001
From: Syed Mohammed Khasim <kha...@ti.com>
Date: Thu, 19 Feb 2009 12:25:26 +0530
Subject: [PATCH] Fix MMC Buid errors with new merges

Signed-off-by: Syed Mohammed Khasim <kha...@ti.com>
---
common/cmd_mmc.c | 1 +
drivers/mmc/omap3_mmc.c | 2 +-
include/mmc.h | 2 --
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index a5d367e..ff1a4e6 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -171,3 +171,4 @@ U_BOOT_CMD(
"mmc write <device num> addr blk# cnt\n"
"mmc rescan <device num>\n"
"mmc list - lists available devices\n");
+#endif
diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index a8345df..64d7666 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -525,7 +525,7 @@ unsigned long mmc_bread(int dev_num, unsigned long
blknr, lbaint_t blkcnt,
return 1;
}

-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
{
if (configure_mmc(&cur_card_data) != 1)
return 1;
diff --git a/include/mmc.h b/include/mmc.h
index b9b27ba..aad59a9 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -268,8 +268,6 @@ struct mmc {

int mmc_register(struct mmc *mmc);
int mmc_initialize(bd_t *bis);
-int mmc_init(struct mmc *mmc);
-int mmc_read(struct mmc *mmc, u64 src, uchar *dst, int size);
struct mmc *find_mmc_device(int dev_num);
void print_mmc_devices(char separator);