summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tvmixer.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-08-11 23:41:56 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 09:14:31 -0700
commitc7a46533ff7ef9e1c51bae6e54208527c5275b24 (patch)
tree4b952a757d60d9cfa4aad8462ee8ef7e03fec6dd /drivers/media/video/tvmixer.c
parent1d8b9e1bad35fa3ea829990b9056c2a257d8fe79 (diff)
[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/media/video/tvmixer.c')
-rw-r--r--drivers/media/video/tvmixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29..f0635b19de3 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -276,9 +276,9 @@ static int tvmixer_clients(struct i2c_client *client)
#else
/* TV card ??? */
switch (client->adapter->id) {
- case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
- case I2C_ALGO_BIT | I2C_HW_B_BT848:
- case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+ case I2C_HW_SMBUS_VOODOO3:
+ case I2C_HW_B_BT848:
+ case I2C_HW_B_RIVA:
/* ok, have a look ... */
break;
default: