summaryrefslogtreecommitdiffstats
path: root/include/linux/kobject.h
diff options
context:
space:
mode:
authorLinus Walleij2015-08-13 14:42:55 +0200
committerLinus Walleij2015-08-13 14:42:55 +0200
commit5f6f02cd49d61e9856ff2c337578316a1a1b3f88 (patch)
treefd2e6961e8f609af41dd4a282008e1bc52cfa7c7 /include/linux/kobject.h
parentgpio: brcmstb: support wakeup from S5 cold boot (diff)
parentLinux 4.2-rc4 (diff)
downloadkernel-qcow2-linux-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.tar.gz
kernel-qcow2-linux-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.tar.xz
kernel-qcow2-linux-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.zip
Merge tag 'v4.2-rc4' into devel
Linux 4.2-rc4
Diffstat (limited to 'include/linux/kobject.h')
-rw-r--r--include/linux/kobject.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 2d61b909f414..637f67002c5a 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -80,8 +80,9 @@ struct kobject {
extern __printf(2, 3)
int kobject_set_name(struct kobject *kobj, const char *name, ...);
-extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
- va_list vargs);
+extern __printf(2, 0)
+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
+ va_list vargs);
static inline const char *kobject_name(const struct kobject *kobj)
{