diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-bit.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 4 |
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) | |||
| 604 | 604 | ||
| 605 | /* register new adapter to i2c module... */ | 605 | /* register new adapter to i2c module... */ |
| 606 | adap->algo = &i2c_bit_algo; | 606 | adap->algo = &i2c_bit_algo; |
| 607 | 607 | adap->retries = 3; | |
| 608 | adap->timeout = 100; /* default values, should */ | ||
| 609 | adap->retries = 3; /* be replaced by defines */ | ||
| 610 | 608 | ||
| 611 | return 0; | 609 | return 0; |
| 612 | } | 610 | } |