Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

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

diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 266135d..9987961 100644 (file)
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -497,7 +497,7 @@ static int stu300_set_clk(struct stu300_dev *dev, unsigned long clkrate)
        u32 val;
        int i = 0;
 
-       /* Locate the apropriate clock setting */
+       /* Locate the appropriate clock setting */
        while (i < ARRAY_SIZE(stu300_clktable) - 1 &&
               stu300_clktable[i].rate < clkrate)
                i++;
@@ -644,7 +644,7 @@ static int stu300_send_address(struct stu300_dev *dev,
        ret = stu300_await_event(dev, STU300_EVENT_6);
 
        /*
-        * Clear any pending EVENT 6 no matter what happend during
+        * Clear any pending EVENT 6 no matter what happened during
         * await_event.
         */
        val = stu300_r8(dev->virtbase + I2C_CR);