commit 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb
author Dmitry Torokhov <dmitry.torokhov@gmail.com> Thu Dec 16 09:17:48 2010 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Thu Dec 16 09:17:48 2010 -0800
tree c076d2f0b5d4ae8726a50206042d3e3a41620fe4
parent 56a8bd6dcf81693e61a712097216904f3a4ab536
parent 69479f8da68f1930b2078b2ebf6533fb00339918

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next

Conflicts:
	drivers/input/Makefile

drivers/input/Makefile

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 9fd1cf2..09614ce 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -5,7 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_INPUT)		+= input-core.o
-input-core-y := input.o input-compat.o ff-core.o
+input-core-y := input.o input-compat.o input-mt.o ff-core.o
 
 obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o
 obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o