Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[~andy/linux] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index a7e3bf4d3c70317273b63003dc18f714a546ac36..b52e9f4ef3719f58c8217deb5e26bdfd59ebaeb9 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -313,8 +313,8 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
                struct kobject *temp_kobj;
                temp_kobj = kset_find_obj(kobj->kset, new_name);
                if (temp_kobj) {
-                       printk(KERN_WARNING "kobject '%s' can not be renamed "
-                              "to '%s' as '%s' is already in existance.\n",
+                       printk(KERN_WARNING "kobject '%s' cannot be renamed "
+                              "to '%s' as '%s' is already in existence.\n",
                               kobject_name(kobj), new_name, new_name);
                        kobject_put(temp_kobj);
                        return -EINVAL;