---

yaml --- r: 346950 b: refs/heads/master c: 58b45d1 h: refs/heads/master v: v3
git-mirror · Nov 24, 2012 · c2295b1 · c2295b1
1 parent dc8c4e7
commit c2295b1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1
+refs/heads/master: 58b45d166f4c16d21f6aa059c6c5d87a9eeb1ff5
diff --git a/trunk/drivers/input/serio/serio.c b/trunk/drivers/input/serio/serio.c
@@ -891,8 +891,6 @@ static int serio_bus_match(struct device *dev, struct device_driver *drv)
 	return serio_match_port(serio_drv->id_table, serio);
 }
 
-#ifdef CONFIG_HOTPLUG
-
 #define SERIO_ADD_UEVENT_VAR(fmt, val...)				\
 	do {								\
 		int err = add_uevent_var(env, fmt, val);		\
@@ -920,15 +918,6 @@ static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
 }
 #undef SERIO_ADD_UEVENT_VAR
 
-#else
-
-static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-	return -ENODEV;
-}
-
-#endif /* CONFIG_HOTPLUG */
-
 #ifdef CONFIG_PM
 static int serio_suspend(struct device *dev)
 {