Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / omap.c

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 6e4896397fed0061e87626f3fa808953bb9be442..b6407ac075351d730f0c94e5f4b6a5d9aef528bb 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1642,6 +1642,7 @@ static struct platform_driver mmc_omap_driver = {
        .resume         = mmc_omap_resume,
        .driver         = {
                .name   = DRIVER_NAME,
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -1660,5 +1661,5 @@ module_exit(mmc_omap_exit);
 
 MODULE_DESCRIPTION("OMAP Multimedia Card driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS(DRIVER_NAME);
+MODULE_ALIAS("platform:" DRIVER_NAME);
 MODULE_AUTHOR("Juha Yrj�l�");