summaryrefslogtreecommitdiff
path: root/include/linux/kobject.h
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-07-17 18:26:58 +0300
committerDoug Ledford <dledford@redhat.com>2017-07-17 18:26:58 +0300
commit3d886aa3be15439e05784ac1cbd4acc2f13c0048 (patch)
tree5d7d5943c7f6697e640bdd684a560e9af7942300 /include/linux/kobject.h
parentb6ea01ba3fe9dcb5e08bbd9ed482845582a1e80b (diff)
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
downloadlinux-3d886aa3be15439e05784ac1cbd4acc2f13c0048.tar.xz
Merge tag 'v4.13-rc1' into k.o/for-4.13-rc
Linux v4.13-rc1
Diffstat (limited to 'include/linux/kobject.h')
-rw-r--r--include/linux/kobject.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index ca85cb80e99a..eeab34b0f589 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -217,11 +217,9 @@ extern struct kobject *firmware_kobj;
int kobject_uevent(struct kobject *kobj, enum kobject_action action);
int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
char *envp[]);
+int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count);
__printf(2, 3)
int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...);
-int kobject_action_type(const char *buf, size_t count,
- enum kobject_action *type);
-
#endif /* _KOBJECT_H_ */