Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

[pandora-kernel.git] / arch / arm / mach-omap2 / hsmmc.c

diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index d492bc4..137e1a5 100644 (file)
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -442,7 +442,7 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr)
        }
        omap_hsmmc_mux(mmc_data, (ctrl_nr - 1));
 
-       name = "mmci-omap-hs";
+       name = "omap_hsmmc";
        ohl = omap_hsmmc_latency;
        ohl_cnt = ARRAY_SIZE(omap_hsmmc_latency);