mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: therm_windtunnel: Convert to a new-style i2c driver therm_adt746x: Convert to a new-style i2c driver windfarm: Convert to new-style i2c drivers therm_pm72: Convert to a new-style i2c driver i2c-viapro: Add new PCI device ID for VX855 i2c/chips: Move max6875 to drivers/misc/eeprom i2c: Do not give adapters a default parent i2c: Do not probe for TV chips on Voodoo3 adapters i2c: Retry automatically on arbitration loss i2c: Remove void casts
This commit is contained in:
commit
4858704da7
20 changed files with 403 additions and 341 deletions
|
|
@ -1315,7 +1315,6 @@ static int __devinit tdfxfb_setup_i2c_bus(struct tdfxfb_i2c_chan *chan,
|
|||
|
||||
strlcpy(chan->adapter.name, name, sizeof(chan->adapter.name));
|
||||
chan->adapter.owner = THIS_MODULE;
|
||||
chan->adapter.class = I2C_CLASS_TV_ANALOG;
|
||||
chan->adapter.algo_data = &chan->algo;
|
||||
chan->adapter.dev.parent = dev;
|
||||
chan->algo.setsda = tdfxfb_i2c_setsda;
|
||||
|
|
|
|||
Loading…
Reference in a new issue