From a12f5139d3e5e196e1b1297ed70d4d2d8e760bbb Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Wed, 9 Dec 2009 19:27:17 -0300 Subject: [PATCH] --- yaml --- r: 179541 b: refs/heads/master c: 0ac6e141eb105f5845eb7066b5279709393b1c78 h: refs/heads/master i: 179539: bd25561cfb8f8aa62de66e814d8259b6560ea6b9 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_i2c.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e2a6568409f..d203b446913c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83dbe82bd7766e5045e6561bd44e22b801e7ad76 +refs/heads/master: 0ac6e141eb105f5845eb7066b5279709393b1c78 diff --git a/trunk/drivers/media/dvb/mantis/mantis_i2c.c b/trunk/drivers/media/dvb/mantis/mantis_i2c.c index 9d2b51d2e4b6..7bb4e78aa714 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_i2c.c +++ b/trunk/drivers/media/dvb/mantis/mantis_i2c.c @@ -33,8 +33,6 @@ #include "mantis_reg.h" #include "mantis_i2c.h" -#define I2C_HW_B_MANTIS 0x1c - #define TRIALS 10000 static int mantis_i2c_read(struct mantis_pci *mantis, const struct i2c_msg *msg) @@ -234,7 +232,6 @@ int __devinit mantis_i2c_init(struct mantis_pci *mantis) i2c_adapter->class = I2C_CLASS_TV_DIGITAL; i2c_adapter->algo = &mantis_algo; i2c_adapter->algo_data = NULL; - i2c_adapter->id = I2C_HW_B_MANTIS; i2c_adapter->timeout = 500; i2c_adapter->retries = 3; i2c_adapter->dev.parent = &pdev->dev;