Merge branch 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux

[pandora-kernel.git] / drivers / i2c / busses / i2c-nomadik.c

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index f7148fd..594ed50 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -434,7 +434,7 @@ static int read_i2c(struct nmk_i2c_dev *dev)
        }
 
        if (timeout == 0) {
-               /* controler has timedout, re-init the h/w */
+               /* controller has timedout, re-init the h/w */
                dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n");
                (void) init_hw(dev);
                status = -ETIMEDOUT;
@@ -498,7 +498,7 @@ static int write_i2c(struct nmk_i2c_dev *dev)
        }
 
        if (timeout == 0) {
-               /* controler has timedout, re-init the h/w */
+               /* controller has timedout, re-init the h/w */
                dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n");
                (void) init_hw(dev);
                status = -ETIMEDOUT;