diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 12:17:48 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 12:17:48 -0500 |
| commit | 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb (patch) | |
| tree | c076d2f0b5d4ae8726a50206042d3e3a41620fe4 /drivers/input/Makefile | |
| parent | 56a8bd6dcf81693e61a712097216904f3a4ab536 (diff) | |
| parent | 69479f8da68f1930b2078b2ebf6533fb00339918 (diff) | |
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 @@ | |||
| 5 | # Each configuration option enables a list of files. | 5 | # Each configuration option enables a list of files. |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_INPUT) += input-core.o | 7 | obj-$(CONFIG_INPUT) += input-core.o |
| 8 | input-core-y := input.o input-compat.o ff-core.o | 8 | input-core-y := input.o input-compat.o input-mt.o ff-core.o |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o | 10 | obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o |
| 11 | obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o | 11 | obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o |