Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-powermac.c

diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 648d55533d87e1a53a9b1d6a58bd21a7f17a77ab..0ab4f2627c26c58c3eb53fb593da0fffe7f03bff 100644 (file)
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -25,7 +25,6 @@
 #include <linux/types.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/completion.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <asm/prom.h>
@@ -122,8 +121,7 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter*     adap,
                if (rc)
                        goto bail;
                rc = pmac_i2c_xfer(bus, addrdir, 1, command,
-                                  read ? data->block : &data->block[1],
-                                  data->block[0]);
+                                  &data->block[1], data->block[0]);
                break;
 
         default: