]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Fix hsmmc init
authorTony Lindgren <tony@atomide.com>
Sat, 6 Dec 2008 00:58:46 +0000 (16:58 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 6 Dec 2008 00:58:46 +0000 (16:58 -0800)
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>
arch/arm/plat-omap/devices.c

index 25c6d103d70621e99d65df50a090f1adc489bdb7..2c3c72f499ecfaf655350d10e99fcbc7842ebe70 100644 (file)
@@ -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;