Merge branch 'omap2-upstream' into devel

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 04f7cd9fc261..be15a6213205 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -523,11 +523,12 @@ static int __exit mpc83xx_spi_remove(struct platform_device *dev)
         return 0;
 }
 
-MODULE_ALIAS("mpc83xx_spi");                    /* for platform bus hotplug */
+MODULE_ALIAS("platform:mpc83xx_spi");
 static struct platform_driver mpc83xx_spi_driver = {
         .remove = __exit_p(mpc83xx_spi_remove),
         .driver = {
-                   .name = "mpc83xx_spi",
+                .name = "mpc83xx_spi",
+                .owner = THIS_MODULE,
         },
 };