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

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index a1c97e88068a..1f784fde2510 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -2036,8 +2036,11 @@ MODULE_DEVICE_TABLE (of, mesh_match);
 
 static struct macio_driver mesh_driver = 
 {
-        .name           = "mesh",
-        .match_table    = mesh_match,
+        .driver = {
+                .name           = "mesh",
+                .owner          = THIS_MODULE,
+                .of_match_table = mesh_match,
+        },
         .probe          = mesh_probe,
         .remove         = mesh_remove,
         .shutdown       = mesh_shutdown,