aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 00:21:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 00:21:02 -0700
commit6d87f207c04370681b9a710b8dbed0f567491e49 (patch)
treeb6ca4ab9f7358f2ec8088fbadcb5f078a9c022f2 /lib
parentd20de763548f9948f4534fc816155d8ee48e1d35 (diff)
parentf6e6e7799ebcad40fa15e4015beca2d776554302 (diff)
downloadkernel_samsung_espresso10-6d87f207c04370681b9a710b8dbed0f567491e49.zip
kernel_samsung_espresso10-6d87f207c04370681b9a710b8dbed0f567491e49.tar.gz
kernel_samsung_espresso10-6d87f207c04370681b9a710b8dbed0f567491e49.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: kobject_uevent: fix typo in comments firmware_class: fix typo in error path kobject: Break the kobject namespace defs into their own header
Diffstat (limited to 'lib')
-rw-r--r--lib/kobject_uevent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index b935795..70af0a7 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -123,7 +123,7 @@ static int kobj_usermode_filter(struct kobject *kobj)
* @kobj: struct kobject that the action is happening to
* @envp_ext: pointer to environmental data
*
- * Returns 0 if kobject_uevent() is completed with success or the
+ * Returns 0 if kobject_uevent_env() is completed with success or the
* corresponding error when it fails.
*/
int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
@@ -317,7 +317,7 @@ exit:
EXPORT_SYMBOL_GPL(kobject_uevent_env);
/**
- * kobject_uevent - notify userspace by ending an uevent
+ * kobject_uevent - notify userspace by sending an uevent
*
* @action: action that is happening
* @kobj: struct kobject that the action is happening to