From: Tony Lindgren <tony@atomide.com>
Date: Sat, 6 Dec 2008 00:58:46 +0000 (-0800)
Subject: Fix hsmmc init
X-Git-Tag: v2.6.28-omap1~84
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=014ba70469e889ebb74516052c43fd06a419b17b;p=linux-2.6-omap-h63xx.git

Fix hsmmc init

It accidentally broke while changing the name for the driver
to not to conflict with the other mmc driver.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 25c6d103d70..2c3c72f499e 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -204,9 +204,15 @@ int __init omap_mmc_add(int id, unsigned long base, unsigned long size,
 {
 	struct platform_device *pdev;
 	struct resource res[OMAP_MMC_NR_RES];
+	char *name;
 	int ret;
 
-	pdev = platform_device_alloc("mmci-omap", id);
+	if (cpu_class_is_omap1() || cpu_is_omap242x())
+		name = "mmci-omap";
+	else
+		name = "mmci-omap-hs";
+
+	pdev = platform_device_alloc(name, id);
 	if (!pdev)
 		return -ENOMEM;