aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-ibm_iic.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-08-11 17:38:52 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 12:14:29 -0400
commit87c3d7a8bc0ff5c8d4481e509b407b6be1859925 (patch)
tree73fadb7bdd87a054cf3131b541af4216ba545755 /drivers/i2c/busses/i2c-ibm_iic.c
parente51cc6b3a365e170d3ebe51c2308fdd42e027a46 (diff)
[PATCH] I2C: Kill i2c_algorithm.id (3/7)
Don't rely on i2c_algorithm.id to alter the i2c adapter's id, use the I2C_ALGO_* value directly instead, because i2c_algorithm will soon have no id member no more. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-ibm_iic.c')
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 1a3366287087..ade9b14e6840 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -726,7 +726,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
726 adap = &dev->adap; 726 adap = &dev->adap;
727 strcpy(adap->name, "IBM IIC"); 727 strcpy(adap->name, "IBM IIC");
728 i2c_set_adapdata(adap, dev); 728 i2c_set_adapdata(adap, dev);
729 adap->id = I2C_HW_OCP | iic_algo.id; 729 adap->id = I2C_ALGO_OCP | I2C_HW_OCP;
730 adap->algo = &iic_algo; 730 adap->algo = &iic_algo;
731 adap->client_register = NULL; 731 adap->client_register = NULL;
732 adap->client_unregister = NULL; 732 adap->client_unregister = NULL;