Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 3163eab3f608..26bf37010586 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -116,7 +116,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
         } else {
                 /* Interrupt mode */
                 result = wait_event_timeout(i2c->queue,
-                        (i2c->interrupt & CSR_MIF), timeout * HZ);
+                        (i2c->interrupt & CSR_MIF), timeout);
 
                 if (unlikely(!(i2c->interrupt & CSR_MIF))) {
                         pr_debug("I2C: wait timeout\n");
@@ -308,7 +308,7 @@ static struct i2c_adapter mpc_ops = {
         .owner = THIS_MODULE,
         .name = "MPC adapter",
         .algo = &mpc_algo,
-        .timeout = 1,
+        .timeout = HZ,
 };
 
 static int __devinit fsl_i2c_probe(struct of_device *op, const struct of_device_id *match)