Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.

[linux-2.6] / drivers / i2c / i2c-core.c

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index f50342832d9540c6d6ee6b5730b6db7009688712..51ce268998cd368fa065f048baee0f0f8956c111 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -238,7 +238,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
        }
 
        /* detach any active clients. This must be done first, because
-        * it can fail; in which case we give upp. */
+        * it can fail; in which case we give up. */
        list_for_each_safe(item, _n, &adap->clients) {
                client = list_entry(item, struct i2c_client, list);