Merge branches 'gemini' and 'misc' into devel

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c
index 5e4563d86f19..9589d8b9b0c1 100644
--- a/arch/sparc/kernel/pmc.c
+++ b/arch/sparc/kernel/pmc.c
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {
 MODULE_DEVICE_TABLE(of, pmc_match);
 
 static struct of_platform_driver pmc_driver = {
-        .name           = "pmc",
-        .match_table    = pmc_match,
+        .driver = {
+                .name = "pmc",
+                .owner = THIS_MODULE,
+                .of_match_table = pmc_match,
+        },
         .probe          = pmc_probe,
 };