Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:06:29 +0000 (10:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:06:29 +0000 (10:06 -0700)
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c: I2C bus multiplexer driver pca954x
  i2c: Multiplexed I2C bus core support
  i2c: Use a separate mutex for userspace client lists
  i2c: Make i2c_default_probe self-sufficient
  i2c: Drop dummy variable
  i2c: Move adapter locking helpers to i2c-core
  V4L/DVB: Use custom I2C probing function mechanism
  i2c: Add support for custom probe function
  i2c-dev: Use memdup_user
  i2c-dev: Remove unnecessary kmalloc casts

1  2 
drivers/macintosh/therm_windtunnel.c

index 133f195de1fd1211871db80a78d8149780cb82b5,7d1bfeb6a82c42d6393d3bd20643b8609b3914d6..c89f396e4c53d418fd15cf1d6078c7ddb9f71975
@@@ -52,7 -52,7 +52,7 @@@ static struct 
        struct task_struct      *poll_task;
        
        struct mutex            lock;
 -      struct of_device        *of_dev;
 +      struct platform_device  *of_dev;
        
        struct i2c_client       *thermostat;
        struct i2c_client       *fan;
@@@ -322,10 -322,10 +322,10 @@@ do_attach( struct i2c_adapter *adapter 
  
                memset(&info, 0, sizeof(struct i2c_board_info));
                strlcpy(info.type, "therm_ds1775", I2C_NAME_SIZE);
-               i2c_new_probed_device(adapter, &info, scan_ds1775);
+               i2c_new_probed_device(adapter, &info, scan_ds1775, NULL);
  
                strlcpy(info.type, "therm_adm1030", I2C_NAME_SIZE);
-               i2c_new_probed_device(adapter, &info, scan_adm1030);
+               i2c_new_probed_device(adapter, &info, scan_adm1030, NULL);
  
                if( x.thermostat && x.fan ) {
                        x.running = 1;
@@@ -444,13 -444,13 +444,13 @@@ static struct i2c_driver g4fan_driver 
  /************************************************************************/
  
  static int
 -therm_of_probe( struct of_device *dev, const struct of_device_id *match )
 +therm_of_probe( struct platform_device *dev, const struct of_device_id *match )
  {
        return i2c_add_driver( &g4fan_driver );
  }
  
  static int
 -therm_of_remove( struct of_device *dev )
 +therm_of_remove( struct platform_device *dev )
  {
        i2c_del_driver( &g4fan_driver );
        return 0;