Merge commit 'v2.6.30-rc1' into sched/urgent

Merge reason: update to latest upstream to queue up fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index eb8f72ca02f4..d420cc5f5633 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -604,9 +604,7 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
 
         /* register new adapter to i2c module... */
         adap->algo = &i2c_bit_algo;
-
-        adap->timeout = 100;    /* default values, should       */
-        adap->retries = 3;      /* be replaced by defines       */
+        adap->retries = 3;
 
         return 0;
 }