Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...

[linux-2.6] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index b46350c278370b3ea799fdd5e220befbb7b83a83..687ab418d292b15084d8a97be48f6003b0d0e315 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -198,14 +198,14 @@ int kobject_add(struct kobject * kobj)
 
                /* be noisy on error issues */
                if (error == -EEXIST)
-                       printk("kobject_add failed for %s with -EEXIST, "
+                       pr_debug("kobject_add failed for %s with -EEXIST, "
                               "don't try to register things with the "
                               "same name in the same directory.\n",
                               kobject_name(kobj));
                else
-                       printk("kobject_add failed for %s (%d)\n",
+                       pr_debug("kobject_add failed for %s (%d)\n",
                               kobject_name(kobj), error);
-               dump_stack();
+               /* dump_stack(); */
        }
 
        return error;