diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-04-17 19:50:46 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-04-17 19:50:46 +0100 |
| commit | 8e3de9d4c2e5ba142d98f53da57dfe1d1867a52a (patch) | |
| tree | 403312989771945761ab407c70b71e43c4caa6dd /drivers/input/Makefile | |
| parent | 6b2bbf987fafeb010fb210a2ef6fcfe885c9a20b (diff) | |
| parent | 2122659a587ea2857b0b6ece13b50d39e6b0771c (diff) | |
| download | vexpress-a9-armlt-linaro-android-3.4.tar.gz | |
Merge branch 'linaro-android-3.4' of git://git.linaro.org/people/jstultz/android into integration-android-vexpressarmlt-linaro-android-3.4
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 b173a13a73c..cf643beec3c 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,3 +25,4 @@ obj-$(CONFIG_INPUT_MISC) += misc/ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o obj-$(CONFIG_INPUT_OF_MATRIX_KEYMAP) += of_keymap.o +obj-$(CONFIG_INPUT_KEYRESET) += keyreset.o |