aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kobject.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-25 11:57:32 -0400
committerSteve French <sfrench@us.ibm.com>2006-06-25 11:57:32 -0400
commitbbe5d235ee201705530a7153b57e141cd77d818b (patch)
treee98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /lib/kobject.c
parent189acaaef81b1d71aedd0d28810de24160c2e781 (diff)
parentdfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'lib/kobject.c')
-rw-r--r--lib/kobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 687ab418d292..8e7c71993487 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -198,14 +198,14 @@ int kobject_add(struct kobject * kobj)
198 198
199 /* be noisy on error issues */ 199 /* be noisy on error issues */
200 if (error == -EEXIST) 200 if (error == -EEXIST)
201 pr_debug("kobject_add failed for %s with -EEXIST, " 201 printk("kobject_add failed for %s with -EEXIST, "
202 "don't try to register things with the " 202 "don't try to register things with the "
203 "same name in the same directory.\n", 203 "same name in the same directory.\n",
204 kobject_name(kobj)); 204 kobject_name(kobj));
205 else 205 else
206 pr_debug("kobject_add failed for %s (%d)\n", 206 printk("kobject_add failed for %s (%d)\n",
207 kobject_name(kobj), error); 207 kobject_name(kobj), error);
208 /* dump_stack(); */ 208 dump_stack();
209 } 209 }
210 210
211 return error; 211 return error;