Merge commit 'v2.6.39-rc3' into for-2.6.39

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

diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 906a3ca..dd36417 100644 (file)
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -295,7 +295,7 @@ static int ali1535_transaction(struct i2c_adapter *adap)
        }
 
        /* Unfortunately the ALI SMB controller maps "no response" and "bus
-        * collision" into a single bit. No reponse is the usual case so don't
+        * collision" into a single bit. No response is the usual case so don't
         * do a printk.  This means that bus collisions go unreported.
         */
        if (temp & ALI1535_STS_BUSERR) {