Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

[linux-2.6-omap-h63xx.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index a181abed89f6f119687e5082208f8debe11dd383..7a0e6809490d4e17e3d461426371871acefdf4e2 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -207,7 +207,7 @@ int kobject_register(struct kobject * kobj)
                               kobject_name(kobj),error);
                        dump_stack();
                } else
-                       kobject_hotplug(kobj, KOBJ_ADD);
+                       kobject_uevent(kobj, KOBJ_ADD);
        } else
                error = -EINVAL;
        return error;
@@ -312,7 +312,7 @@ void kobject_del(struct kobject * kobj)
 void kobject_unregister(struct kobject * kobj)
 {
        pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
-       kobject_hotplug(kobj, KOBJ_REMOVE);
+       kobject_uevent(kobj, KOBJ_REMOVE);
        kobject_del(kobj);
        kobject_put(kobj);
 }