diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2006-04-25 09:37:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-27 16:08:56 -0400 |
| commit | 4d17ffda331ba6030bb8c233c73d6a87954d8ea7 (patch) | |
| tree | 3de71893233afa664ad6419e37a02da7ccef327f /include | |
| parent | 913e7ec545462b9a49fa308d0c81697236f7d29d (diff) | |
[PATCH] Kobject: fix build error
This fixes a build error for various odd combinations of CONFIG_HOTPLUG
and CONFIG_NET.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: Nigel Cunningham <ncunningham@cyclades.com>
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index dcd0623be892..e38bb357282a 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -259,7 +259,7 @@ struct subsys_attribute { | |||
| 259 | extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); | 259 | extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); |
| 260 | extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *); | 260 | extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *); |
| 261 | 261 | ||
| 262 | #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) | 262 | #if defined(CONFIG_HOTPLUG) |
| 263 | void kobject_uevent(struct kobject *kobj, enum kobject_action action); | 263 | void kobject_uevent(struct kobject *kobj, enum kobject_action action); |
| 264 | 264 | ||
| 265 | int add_uevent_var(char **envp, int num_envp, int *cur_index, | 265 | int add_uevent_var(char **envp, int num_envp, int *cur_index, |