diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-09 03:11:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-09 03:11:47 +0200 |
| commit | 837525e344298335ea56c3b8c9ca7abbc97f0285 (patch) | |
| tree | e7afd356670edab6f3550fa9cc0eb9c926b590df /lib | |
| parent | Protect <linux/console_struct.h> from multiple inclusion (diff) | |
| parent | firmware: remove orphaned Email (diff) | |
| download | linux-837525e344298335ea56c3b8c9ca7abbc97f0285.tar.xz linux-837525e344298335ea56c3b8c9ca7abbc97f0285.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
firmware: remove orphaned Email
kobject: use the proper printk level for kobject error
Driver core: kill unused code
Driver core: keep PHYSDEV for old struct class_device
update Documentation/driver-model/platform.txt
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index fc5f3f6e7329..ac1520651b9b 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -202,14 +202,14 @@ int kobject_shadow_add(struct kobject * kobj, struct dentry *shadow_parent) /* be noisy on error issues */ if (error == -EEXIST) - printk("kobject_add failed for %s with -EEXIST, " - "don't try to register things with the " - "same name in the same directory.\n", + printk(KERN_ERR "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", + printk(KERN_ERR "kobject_add failed for %s (%d)\n", kobject_name(kobj), error); - dump_stack(); + dump_stack(); } return error; |