summaryrefslogtreecommitdiffstats
path: root/drivers/input/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-16 09:17:48 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-16 09:17:48 -0800
commit67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb (patch)
treec076d2f0b5d4ae8726a50206042d3e3a41620fe4 /drivers/input/Makefile
parent56a8bd6dcf81693e61a712097216904f3a4ab536 (diff)
parent69479f8da68f1930b2078b2ebf6533fb00339918 (diff)
downloadop-kernel-dev-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.zip
op-kernel-dev-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.tar.gz
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Conflicts: drivers/input/Makefile
Diffstat (limited to 'drivers/input/Makefile')
-rw-r--r--drivers/input/Makefile2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud