Merge ../torvalds-2.6/

[linux-drm-fsl-dcu.git] / drivers / macintosh / therm_adt746x.c

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 5e1f5e9653cb36d1b23e86c5d764ebd13f74dc80..5ebfd1d138dafc027d3c1c0ed37f926e010f0834 100644 (file)
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -176,9 +176,9 @@ detach_thermostat(struct i2c_adapter *adapter)
 }
 
 static struct i2c_driver thermostat_driver = {  
-       .owner          = THIS_MODULE,
-       .name           = "therm_adt746x",
-       .flags          = I2C_DF_NOTIFY,
+       .driver = {
+               .name   = "therm_adt746x",
+       },
        .attach_adapter = attach_thermostat,
        .detach_adapter = detach_thermostat,
 };