From 29b1fc0ef2137280e472b0230d3d26c1cb9f0dac Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sat, 4 Mar 2006 13:15:31 +0100 Subject: [PATCH] --- yaml --- r: 22011 b: refs/heads/master c: 22f98c0cd7e003b896ee52ded945081307118745 h: refs/heads/master i: 22009: e52c437b9286cedc224986e165b233256599d3ee 22007: 40dfe12bc3309b5cbb56c40678137d3516a823ec v: v3 --- [refs] | 2 +- trunk/include/linux/kobject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index babfad412d9d..9fb35c92c713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcd0da002122a70fe1c625c0ca9f58c95aa33ebe +refs/heads/master: 22f98c0cd7e003b896ee52ded945081307118745 diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h index c374b5fa8d3b..7ece63f8abbd 100644 --- a/trunk/include/linux/kobject.h +++ b/trunk/include/linux/kobject.h @@ -255,7 +255,7 @@ struct subsys_attribute { extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *); -#if defined(CONFIG_HOTPLUG) & defined(CONFIG_NET) +#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,