From: Adrian Bunk Date: Sat, 4 Mar 2006 12:15:31 +0000 (+0100) Subject: [PATCH] Kobject: kobject.h: fix a typo X-Git-Tag: v2.6.17-rc1~1177^2~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22f98c0cd7e003b896ee52ded945081307118745;p=linux-2.6 [PATCH] Kobject: kobject.h: fix a typo It shouldn't cause real harm, but it hurts my eyes. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/kobject.h b/include/linux/kobject.h index c374b5fa8d..7ece63f8ab 100644 --- a/include/linux/kobject.h +++ b/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,