diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-08-11 17:41:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:31 -0400 |
| commit | c7a46533ff7ef9e1c51bae6e54208527c5275b24 (patch) | |
| tree | 4b952a757d60d9cfa4aad8462ee8ef7e03fec6dd /drivers/media/video/ir-kbd-i2c.c | |
| parent | 1d8b9e1bad35fa3ea829990b9056c2a257d8fe79 (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/ir-kbd-i2c.c')
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 9fc5055e001c..c2f32d522668 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
| @@ -429,7 +429,7 @@ static int ir_probe(struct i2c_adapter *adap) | |||
| 429 | struct i2c_client c; char buf; int i,rc; | 429 | struct i2c_client c; char buf; int i,rc; |
| 430 | 430 | ||
| 431 | switch (adap->id) { | 431 | switch (adap->id) { |
| 432 | case I2C_ALGO_BIT | I2C_HW_B_BT848: | 432 | case I2C_HW_B_BT848: |
| 433 | probe = probe_bttv; | 433 | probe = probe_bttv; |
| 434 | break; | 434 | break; |
| 435 | case I2C_ALGO_SAA7134: | 435 | case I2C_ALGO_SAA7134: |