---

yaml --- r: 22011 b: refs/heads/master c: 22f98c0 h: refs/heads/master i: 22009: e52c437 22007: 40dfe12 v: v3
git-mirror · Mar 20, 2006 · 29b1fc0 · 29b1fc0
1 parent 89a86d7
commit 29b1fc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,