Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index d7958b8354b4bf3c95f6eb45de0bba6f3f5c1d6c..9903e35d0b20966b3245f78869ff7b4873fd5111 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -476,8 +476,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 
        omap_i2c_enable_clocks(dev);
 
-       /* REVISIT: initialize and use adap->retries. This is an optional
-        * feature */
        if ((r = omap_i2c_wait_for_bb(dev)) < 0)
                goto out;