diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /drivers/i2c/busses/i2c-iop3xx.c | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'drivers/i2c/busses/i2c-iop3xx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 3190690c26ce..a75c75e77b92 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
| @@ -488,7 +488,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) | |||
| 488 | /* | 488 | /* |
| 489 | * Default values...should these come in from board code? | 489 | * Default values...should these come in from board code? |
| 490 | */ | 490 | */ |
| 491 | new_adapter->timeout = 100; | 491 | new_adapter->timeout = HZ; |
| 492 | new_adapter->algo = &iop3xx_i2c_algo; | 492 | new_adapter->algo = &iop3xx_i2c_algo; |
| 493 | 493 | ||
| 494 | init_waitqueue_head(&adapter_data->waitq); | 494 | init_waitqueue_head(&adapter_data->waitq); |