diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-13 17:09:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-13 17:09:39 -0400 |
| commit | eedab661a51966c454e38c17266a531aa58b4a98 (patch) | |
| tree | 1f185821f45cccb2ecc91ae0303eda201eb83212 /drivers/input/Makefile | |
| parent | c3bff2ec10b8bf2f53c954e370f9bdae93064472 (diff) | |
| parent | 893e7c2db05f14032f2390ef7c59a499fc25ccae (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: move input-polldev to drivers/input
Input: i8042 - add ULI EV4873 to noloop list
Input: i8042 - add ASUS P65UP5 to the noloop list
Input: usbtouchscreen - fix fallout caused by move from drivers/usb
Diffstat (limited to 'drivers/input/Makefile')
| -rw-r--r-- | drivers/input/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 8a2dd987546c..15eb752697b3 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile | |||
| @@ -8,6 +8,7 @@ obj-$(CONFIG_INPUT) += input-core.o | |||
| 8 | input-core-objs := input.o ff-core.o | 8 | input-core-objs := input.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 | 12 | ||
| 12 | obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o | 13 | obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o |
| 13 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o | 14 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o |