diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 09:17:48 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 09:17:48 -0800 |
| commit | 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb (patch) | |
| tree | c076d2f0b5d4ae8726a50206042d3e3a41620fe4 /drivers/input/Makefile | |
| parent | Input: add ST1232 touchscreen controller driver (diff) | |
| parent | Input: include MT library as source for kerneldoc (diff) | |
| download | linux-dev-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.tar.xz linux-dev-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.zip | |
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/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 9fd1cf2b705e..09614ce74961 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 |