From 617d7faccda4e1ed05924d2e347739bf205c537e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 5 Nov 2007 13:59:11 +0100 Subject: [PATCH] --- yaml --- r: 74307 b: refs/heads/master c: 71409a498e96a421bdc20e7275ebc4fab8b14cdc h: refs/heads/master i: 74305: 60d7d831a5fc569cd3fcc160c9a313fba05f5432 74303: 75dda3d592fe7be9e390b17bc3eb102957a9db8e v: v3 --- [refs] | 2 +- trunk/lib/kobject.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c7a75a60419..d0e96a5927b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f4ebbbf188805036afc915eb759f4b294815857 +refs/heads/master: 71409a498e96a421bdc20e7275ebc4fab8b14cdc diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c index a7e3bf4d3c70..b52e9f4ef371 100644 --- a/trunk/lib/kobject.c +++ b/trunk/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;