From 13009e3f28d6022972463a7a1b0862c94efc5f6a Mon Sep 17 00:00:00 2001
From: Igor Grinberg <grinberg@compulab.co.il>
Date: Mon, 18 Apr 2011 17:52:31 -0400
Subject: [PATCH] OMAP3: CM-T35: fix mmc

Use CONFIG_OMAP3_MMC in cm-t35 configuration file.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
---
 board/cm_t35/cm_t35.c    | 7 -------
 include/configs/cm_t35.h | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 3b6f7ef7a4..23efacc2fa 100644
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -272,13 +272,6 @@ void set_muxconf_regs(void)
 	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M0)); /*MMC1_DAT7*/
 }
 
-#ifdef CONFIG_GENERIC_MMC
-int board_mmc_init(bd_t *bis)
-{
-	return omap_mmc_init(0);
-}
-#endif
-
 /*
  * Routine: setup_net_chip_gmpc
  * Description: Setting up the configuration GPMC registers specific to the
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 5624abd9a7..3692810f5d 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -110,9 +110,8 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
-#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
+#define CONFIG_OMAP3_MMC		1
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */
-- 
2.39.5