diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 18:11:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 18:11:41 -0500 |
| commit | cfb901bf84fe22eb86525e9fb20675b53fb0462a (patch) | |
| tree | e1e710df2c1ba0da26b12f7487fdac6cedc7e166 /drivers/i2c/busses/i2c-piix4.c | |
| parent | 2034563ca323ee45f37a32911550d21c1f1e9626 (diff) | |
| parent | 5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Warn on deprecated binding model use
eeprom: More consistent symbol names
eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom
spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom
i2c: Move old eeprom driver to /drivers/misc/eeprom
i2c: Move at24 to drivers/misc/eeprom
i2c: Quilt tree has moved
i2c: Delete many unused adapter IDs
i2c: Delete 10 unused driver IDs
Diffstat (limited to 'drivers/i2c/busses/i2c-piix4.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-piix4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index eaa9b387543e..761f9dd53620 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c | |||
| @@ -403,7 +403,6 @@ static const struct i2c_algorithm smbus_algorithm = { | |||
| 403 | 403 | ||
| 404 | static struct i2c_adapter piix4_adapter = { | 404 | static struct i2c_adapter piix4_adapter = { |
| 405 | .owner = THIS_MODULE, | 405 | .owner = THIS_MODULE, |
| 406 | .id = I2C_HW_SMBUS_PIIX4, | ||
| 407 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, | 406 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
| 408 | .algo = &smbus_algorithm, | 407 | .algo = &smbus_algorithm, |
| 409 | }; | 408 | }; |