diff --git a/[refs] b/[refs]
index f9bb679f3a58..6cc282402c4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ae91c21dd29e413f4111978152c14061f0984b0
+refs/heads/master: 1c4115e595dec42aa0e81ba47ef46e35b34ed428
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
index e828aab7dace..16ec33f27c5d 100644
--- a/trunk/drivers/input/input.c
+++ b/trunk/drivers/input/input.c
@@ -1273,6 +1273,7 @@ static int input_dev_uevent(struct device *device, struct kobj_uevent_env *env)
 		}						\
 	} while (0)
 
+#ifdef CONFIG_PM
 static void input_dev_reset(struct input_dev *dev, bool activate)
 {
 	if (!dev->event)
@@ -1287,7 +1288,6 @@ static void input_dev_reset(struct input_dev *dev, bool activate)
 	}
 }
 
-#ifdef CONFIG_PM
 static int input_dev_suspend(struct device *dev)
 {
 	struct input_dev *input_dev = to_input_dev(dev);