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 18:14:31 +0200 |
| commit | c7a46533ff7ef9e1c51bae6e54208527c5275b24 (patch) | |
| tree | 4b952a757d60d9cfa4aad8462ee8ef7e03fec6dd /drivers/video | |
| parent | [PATCH] I2C: Kill i2c_algorithm.id (4/7) (diff) | |
| download | linux-c7a46533ff7ef9e1c51bae6e54208527c5275b24.tar.xz 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/video')
| -rw-r--r-- | drivers/video/matrox/matroxfb_maven.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 67f85344f0cc..ad60bbb16cdf 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c @@ -1271,7 +1271,7 @@ ERROR0:; } static int maven_attach_adapter(struct i2c_adapter* adapter) { - if (adapter->id == (I2C_ALGO_BIT | I2C_HW_B_G400)) + if (adapter->id == I2C_HW_B_G400) return i2c_probe(adapter, &addr_data, &maven_detect_client); return 0; } |