From c2295b1ce1ba944abc3fcac6c04d790c5f733d6f Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 22 Nov 2012 23:28:57 -0800
Subject: [PATCH] --- yaml --- r: 346950 b: refs/heads/master c:
 58b45d166f4c16d21f6aa059c6c5d87a9eeb1ff5 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/input/serio/serio.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 91fadab5a2e4..53b94ad478c0 100644
--- 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
index d0f7533dbf88..25fc5971f426 100644
--- 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)
 {