diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/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 | } |