Merge commit 'v2.6.35-rc3' into for-linus

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index b6855a6476f8..1c5221f79d6f 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -997,8 +997,11 @@ MODULE_DEVICE_TABLE (of, mace_match);
 
 static struct macio_driver mace_driver =
 {
-        .name           = "mace",
-        .match_table    = mace_match,
+        .driver = {
+                .name           = "mace",
+                .owner          = THIS_MODULE,
+                .of_match_table = mace_match,
+        },
         .probe          = mace_probe,
         .remove         = mace_remove,
 };