diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-11 01:37:08 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-11 01:38:47 -0400 |
| commit | 1932811f426fee71b7ece67e70aeba7e1b0ebb6d (patch) | |
| tree | ffc4598961733707a89e711b4614c8cc14446ad5 /drivers/input/Makefile | |
| parent | d0a3457d38adbad37e43ffe6b763360b2bfe71d9 (diff) | |
Input: matrix-keymap - uninline and prepare for device tree support
Change matrix-keymap helper to be out-of-line, like sparse keymap,
allow the helper perform basic keymap validation and return errors,
and prepare for device tree support.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
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 b173a13a73ca..5ca3f631497f 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile | |||
| @@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o input-mt.o ff-core.o | |||
| 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 | obj-$(CONFIG_INPUT_SPARSEKMAP) += sparse-keymap.o |
| 13 | obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o | ||
| 13 | 14 | ||
| 14 | obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o | 15 | obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o |
| 15 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o | 16 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o |
| @@ -24,4 +25,3 @@ obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/ | |||
| 24 | obj-$(CONFIG_INPUT_MISC) += misc/ | 25 | obj-$(CONFIG_INPUT_MISC) += misc/ |
| 25 | 26 | ||
| 26 | obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o | 27 | obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o |
| 27 | obj-$(CONFIG_INPUT_OF_MATRIX_KEYMAP) += of_keymap.o | ||