Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / drivers / macintosh / therm_windtunnel.c

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 6aaa1df..738faab 100644 (file)
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -27,7 +27,6 @@
  *   
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -354,10 +353,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,
 };
@@ -485,14 +484,14 @@ struct apple_thermal_info {
 static int __init
 g4fan_init( void )
 {
-       struct apple_thermal_info *info;
+       const struct apple_thermal_info *info;
        struct device_node *np;
 
        init_MUTEX( &x.lock );
 
        if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
                return -ENODEV;
-       info = (struct apple_thermal_info*)get_property(np, "thermal-info", NULL);
+       info = get_property(np, "thermal-info", NULL);
        of_node_put(np);
 
        if( !info || !machine_is_compatible("PowerMac3,6") )