diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2007-08-12 20:43:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 14:51:06 -0700 |
| commit | 5c5daf657cb5f963a38413f2852279d7a3843144 (patch) | |
| tree | ec314c25ca40528bd4625944a93846d1654c9cd9 /include/linux/kobject.h | |
| parent | 07c015e7654821f2dda00dcf152c65b2afd46ac3 (diff) | |
| download | op-kernel-dev-5c5daf657cb5f963a38413f2852279d7a3843144.zip op-kernel-dev-5c5daf657cb5f963a38413f2852279d7a3843144.tar.gz | |
Driver core: exclude kobject_uevent.c for !CONFIG_HOTPLUG
Move uevent specific logic from the core into kobject_uevent.c, which
does no longer require to link the unused string array if hotplug
is not compiled in.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 56f5eaf..0777b3f 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -58,9 +58,6 @@ enum kobject_action { KOBJ_MAX }; -/* The list of strings defining the valid kobject actions as specified above */ -extern const char *kobject_actions[]; - struct kobject { const char * k_name; struct kref kref; @@ -241,6 +238,9 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) __attribute__((format (printf, 2, 3))); + +int kobject_action_type(const char *buf, size_t count, + enum kobject_action *type); #else static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action) { return 0; } @@ -251,6 +251,10 @@ static inline int kobject_uevent_env(struct kobject *kobj, static inline int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) { return 0; } + +static inline int kobject_action_type(const char *buf, size_t count, + enum kobject_action *type) +{ return -EINVAL; } #endif #endif /* __KERNEL__ */ |
