diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-08-11 23:41:56 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:31 -0700 |
commit | c7a46533ff7ef9e1c51bae6e54208527c5275b24 (patch) | |
tree | 4b952a757d60d9cfa4aad8462ee8ef7e03fec6dd /drivers/i2c/busses/i2c-isa.c | |
parent | 1d8b9e1bad35fa3ea829990b9056c2a257d8fe79 (diff) | |
download | blackbird-op-linux-c7a46533ff7ef9e1c51bae6e54208527c5275b24.tar.gz blackbird-op-linux-c7a46533ff7ef9e1c51bae6e54208527c5275b24.zip |
[PATCH] I2C: Kill i2c_algorithm.id (5/7)
Merge the algorithm id part (16 upper bits) of the i2c adapters ids
into the definition of the adapters ids directly. After that, we don't
need to OR both ids together for each i2c_adapter structure.
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-isa.c')
-rw-r--r-- | drivers/i2c/busses/i2c-isa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c index baae5dbc198e..bdc6806dafae 100644 --- a/drivers/i2c/busses/i2c-isa.c +++ b/drivers/i2c/busses/i2c-isa.c @@ -49,7 +49,7 @@ static struct i2c_algorithm isa_algorithm = { /* There can only be one... */ static struct i2c_adapter isa_adapter = { .owner = THIS_MODULE, - .id = I2C_ALGO_ISA | I2C_HW_ISA, + .id = I2C_HW_ISA, .class = I2C_CLASS_HWMON, .algo = &isa_algorithm, .name = "ISA main adapter", |