diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/input/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 4c9c745a7020..7ad212d31f99 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile | |||
| @@ -9,6 +9,7 @@ input-core-objs := input.o input-compat.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 |
| 12 | obj-$(CONFIG_INPUT_SPARSEKMAP) += sparse-keymap.o | ||
| 12 | 13 | ||
| 13 | obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o | 14 | obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o |
| 14 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o | 15 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o |