Merge with Linus' kernel.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 6aaa1df1a64e..3d9dd2e166aa 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -354,10 +354,10 @@ do_detach( struct i2c_client *client )
 }
 
 static struct i2c_driver g4fan_driver = {  
-        .owner          = THIS_MODULE,
-        .name           = "therm_windtunnel",
+        .driver = {
+                .name   = "therm_windtunnel",
+        },
         .id             = I2C_DRIVERID_G4FAN,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = do_attach,
         .detach_client  = do_detach,
 };