From b56c85536b229771deda162e858431eee53356eb Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 6 Dec 2009 17:06:22 +0100
Subject: [PATCH] --- yaml --- r: 172363 b: refs/heads/master c:
 da44bdeb95ea75eec263f42f7703bbf14f004f6a h: refs/heads/master i:   172361:
 a153fe778ac69c0c38ea0cb5c4c65a4065a2370f   172359:
 540f49ec23c06ba1d3f1c0f5f76755ea114c6b24 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/i2c/busses/i2c-iop3xx.c   | 6 ------
 trunk/drivers/i2c/busses/i2c-mv64xxx.c  | 3 ---
 trunk/drivers/i2c/busses/i2c-powermac.c | 2 --
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ff0854584b0e..965214b9205e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 194684e596af4bdaebb424166d94a8aa528edfda
+refs/heads/master: da44bdeb95ea75eec263f42f7703bbf14f004f6a
diff --git a/trunk/drivers/i2c/busses/i2c-iop3xx.c b/trunk/drivers/i2c/busses/i2c-iop3xx.c
index a75c75e77b92..5901707fc66a 100644
--- a/trunk/drivers/i2c/busses/i2c-iop3xx.c
+++ b/trunk/drivers/i2c/busses/i2c-iop3xx.c
@@ -56,12 +56,6 @@ iic_cook_addr(struct i2c_msg *msg)
 	if (msg->flags & I2C_M_RD)
 		addr |= 1;
 
-	/*
-	 * Read or Write?
-	 */
-	if (msg->flags & I2C_M_REV_DIR_ADDR)
-		addr ^= 1;
-
 	return addr;   
 }
 
diff --git a/trunk/drivers/i2c/busses/i2c-mv64xxx.c b/trunk/drivers/i2c/busses/i2c-mv64xxx.c
index bbab0e166630..ed387ffa4730 100644
--- a/trunk/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/trunk/drivers/i2c/busses/i2c-mv64xxx.c
@@ -338,9 +338,6 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
 	if (msg->flags & I2C_M_RD)
 		dir = 1;
 
-	if (msg->flags & I2C_M_REV_DIR_ADDR)
-		dir ^= 1;
-
 	if (msg->flags & I2C_M_TEN) {
 		drv_data->addr1 = 0xf0 | (((u32)msg->addr & 0x300) >> 7) | dir;
 		drv_data->addr2 = (u32)msg->addr & 0xff;
diff --git a/trunk/drivers/i2c/busses/i2c-powermac.c b/trunk/drivers/i2c/busses/i2c-powermac.c
index 02b02413850a..1c440a70ec61 100644
--- a/trunk/drivers/i2c/busses/i2c-powermac.c
+++ b/trunk/drivers/i2c/busses/i2c-powermac.c
@@ -162,8 +162,6 @@ static int i2c_powermac_master_xfer(	struct i2c_adapter *adap,
 		return -EINVAL;
 	read = (msgs->flags & I2C_M_RD) != 0;
 	addrdir = (msgs->addr << 1) | read;
-	if (msgs->flags & I2C_M_REV_DIR_ADDR)
-		addrdir ^= 1;
 
 	rc = pmac_i2c_open(bus, 0);
 	if (rc) {