Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[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 89a30028ddb6e40d9cd00402936460e196a32f9b..cb55cf2ba1e91a4279f3406f34216b4a59f4094e 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -203,7 +203,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                while (!(omap_i2c_read_reg(dev, OMAP_I2C_SYSS_REG) &
                         OMAP_I2C_SYSS_RDONE)) {
                        if (time_after(jiffies, timeout)) {
-                               dev_warn(dev->dev, "timeout waiting"
+                               dev_warn(dev->dev, "timeout waiting "
                                                "for controller reset\n");
                                return -ETIMEDOUT;
                        }
@@ -483,7 +483,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                        dev->buf_len--;
                                }
                        } else
-                               dev_err(dev->dev, "RRDY IRQ while no data"
+                               dev_err(dev->dev, "RRDY IRQ while no data "
                                                "requested\n");
                        omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY);
                        continue;
@@ -498,7 +498,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                        dev->buf_len--;
                                }
                        } else
-                               dev_err(dev->dev, "XRDY IRQ while no"
+                               dev_err(dev->dev, "XRDY IRQ while no "
                                        "data to send\n");
                        omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
                        omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);