X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fplat-omap%2Fdevices.c;h=6b742a8ee4e53be2125c75ac231cd2840f9f9ca1;hb=70ff4a1aafd2378c9e3ff153135ba6d0bde45215;hp=dd836e2dbf8c89c20717810a56fb9c7b9ee56794;hpb=8e722f8aec1735a912e2c63e0a8be9e4fdc8597a;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index dd836e2dbf8..6b742a8ee4e 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -199,19 +199,14 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
 /*
  * Register MMC devices. Called from mach-omap1 and mach-omap2 device init.
  */
-int __init omap_mmc_add(int id, unsigned long base, unsigned long size,
-		unsigned int irq, struct omap_mmc_platform_data *data)
+int __init omap_mmc_add(const char *name, int id, unsigned long base,
+				unsigned long size, unsigned int irq,
+				struct omap_mmc_platform_data *data)
 {
 	struct platform_device *pdev;
 	struct resource res[OMAP_MMC_NR_RES];
-	char *name;
 	int ret;
 
-	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;