Merge commit 'v2.6.35-rc1' into for-2.6.36

1 files changed, 5 insertions, 2 deletions

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 574af56ba8a6..71221fd20944 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1065,8 +1065,11 @@ static const struct of_device_id amd7930_match[] = {
 };
 
 static struct of_platform_driver amd7930_sbus_driver = {
-        .name           = "audio",
-        .match_table    = amd7930_match,
+        .driver = {
+                .name = "audio",
+                .owner = THIS_MODULE,
+                .of_match_table = amd7930_match,
+        },
         .probe          = amd7930_sbus_probe,
 };