summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-03-04 13:15:31 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-20 13:42:59 -0800
commit22f98c0cd7e003b896ee52ded945081307118745 (patch)
tree4fe7416dc8e98b38b71adf7bac04252de6614374 /include/linux
parentdcd0da002122a70fe1c625c0ca9f58c95aa33ebe (diff)
[PATCH] Kobject: kobject.h: fix a typo
It shouldn't cause real harm, but it hurts my eyes. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/kobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index c374b5fa8d3..7ece63f8abb 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,