Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

[safe/jmp/linux-2.6] / include / linux / kobject.h

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 8eb21f2..2a8d8da 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -253,7 +253,7 @@ struct subsys_attribute {
 extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
 extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
 
-#ifdef CONFIG_HOTPLUG
+#if defined(CONFIG_HOTPLUG) & defined(CONFIG_NET)
 void kobject_uevent(struct kobject *kobj, enum kobject_action action);
 
 int add_uevent_var(char **envp, int num_envp, int *cur_index,