From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 30 Mar 2009 03:04:53 +0000 (+1100)
Subject: Merge commit 'origin/master' into next
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9ff9a26b786c35ee8d2a66222924a807ec851a9f;p=linux-2.6-omap-h63xx.git

Merge commit 'origin/master' into next

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

9ff9a26b786c35ee8d2a66222924a807ec851a9f
diff --cc arch/powerpc/include/asm/ps3fb.h
index 1a91daf362c,e7233a84968..90dbefb8cfc
--- a/arch/powerpc/include/asm/ps3fb.h
+++ b/arch/powerpc/include/asm/ps3fb.h
@@@ -19,8 -19,8 +19,9 @@@
  #ifndef _ASM_POWERPC_PS3FB_H_
  #define _ASM_POWERPC_PS3FB_H_
  
+ #include <linux/types.h>
  #include <linux/ioctl.h>
 +#include <linux/types.h>
  
  /* ioctl */
  #define PS3FB_IOCTL_SETMODE       _IOW('r',  1, int) /* set video mode */
diff --cc drivers/i2c/busses/i2c-mpc.c
index 3163eab3f60,2b847d87594..26bf3701058
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@@ -115,10 -115,13 +115,10 @@@ static int i2c_wait(struct mpc_i2c *i2c
  		writeb(0, i2c->base + MPC_I2C_SR);
  	} else {
  		/* Interrupt mode */
 -		result = wait_event_interruptible_timeout(i2c->queue,
 +		result = wait_event_timeout(i2c->queue,
- 			(i2c->interrupt & CSR_MIF), timeout * HZ);
+ 			(i2c->interrupt & CSR_MIF), timeout);
  
 -		if (unlikely(result < 0)) {
 -			pr_debug("I2C: wait interrupted\n");
 -			writeccr(i2c, 0);
 -		} else if (unlikely(!(i2c->interrupt & CSR_MIF))) {
 +		if (unlikely(!(i2c->interrupt & CSR_MIF))) {
  			pr_debug("I2C: wait timeout\n");
  			writeccr(i2c, 0);
  			result = -ETIMEDOUT;