diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-08-11 23:38:52 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 18:14:29 +0200 |
commit | 87c3d7a8bc0ff5c8d4481e509b407b6be1859925 (patch) | |
tree | 73fadb7bdd87a054cf3131b541af4216ba545755 /drivers/i2c/busses | |
parent | [PATCH] I2C: Kill i2c_algorithm.id (2/7) (diff) | |
download | linux-87c3d7a8bc0ff5c8d4481e509b407b6be1859925.tar.xz linux-87c3d7a8bc0ff5c8d4481e509b407b6be1859925.zip |
[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')
-rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 2 |
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){ adap = &dev->adap; strcpy(adap->name, "IBM IIC"); i2c_set_adapdata(adap, dev); - adap->id = I2C_HW_OCP | iic_algo.id; + adap->id = I2C_ALGO_OCP | I2C_HW_OCP; adap->algo = &iic_algo; adap->client_register = NULL; adap->client_unregister = NULL; |