diff --git a/[refs] b/[refs]
index c45107354270..cc092845419a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f09830ab15bfb7eb4e832e44189b5b5883309811
+refs/heads/master: ebde50d5a49122c164f81958a03993e1c947c0b6
diff --git a/trunk/drivers/input/Makefile b/trunk/drivers/input/Makefile
index 7ad212d31f99..9fd1cf2b705e 100644
--- a/trunk/drivers/input/Makefile
+++ b/trunk/drivers/input/Makefile
@@ -5,7 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_INPUT)		+= input-core.o
-input-core-objs := input.o input-compat.o ff-core.o
+input-core-y := input.o input-compat.o ff-core.o
 
 obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o
 obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o