diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
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 | } |