diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
commit | 2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch) | |
tree | c1e9868a4b91beeebd5f4e820588bc2ae8371911 /drivers/i2c/busses/i2c-ibm_iic.c | |
parent | 42bb8cc5e81028e217105299001070d57eb84ad7 (diff) | |
parent | adfafefd104d840ee4461965f22624d77532675b (diff) |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'drivers/i2c/busses/i2c-ibm_iic.c')
-rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 651f2f1ae5b..88f0db73b36 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -746,7 +746,6 @@ static int __devinit iic_probe(struct of_device *ofdev, adap->dev.parent = &ofdev->dev; strlcpy(adap->name, "IBM IIC", sizeof(adap->name)); i2c_set_adapdata(adap, dev); - adap->id = I2C_HW_OCP; adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; adap->algo = &iic_algo; adap->timeout = 1; |