diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 11:29:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 11:29:17 -0700 |
| commit | 4858704da75ba84ce21e6d4b3b974e8b8594c9f2 (patch) | |
| tree | 153f92e4ac0d5c90890ee1b14458ea56e22f984e /drivers/video | |
| parent | 86ade88e15b0852fa437e816037ecb266ae990ad (diff) | |
| parent | 036533e232922ec6667817de9b037d0b1ebd062e (diff) | |
| download | blackbird-obmc-linux-4858704da75ba84ce21e6d4b3b974e8b8594c9f2.tar.gz blackbird-obmc-linux-4858704da75ba84ce21e6d4b3b974e8b8594c9f2.zip | |
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
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tdfxfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 89f231dc443f..ff43c8885028 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c @@ -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; |
