summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/Makefile
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2011-05-11 23:32:01 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-12 17:28:58 +0200
commit36682b81de32090f5c9fac165e71ab8939aab8c0 (patch)
tree117c09e71f3482fc3b483f4ee7345437df28e1f8 /drivers/input/keyboard/Makefile
parentInput: remove useless synchronize_rcu() calls (diff)
downloadlinux-36682b81de32090f5c9fac165e71ab8939aab8c0.tar.xz
linux-36682b81de32090f5c9fac165e71ab8939aab8c0.zip
Input: add driver FSL MPR121 capacitive touch sensor
This patch adds basic support for Freescale MPR121 capacitive touch sensor. It's an i2c controller with up to 12 capacitance sensing inputs. Product information (data sheet, application notes) can be found here: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MPR121 Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard/Makefile')
-rw-r--r--drivers/input/keyboard/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 878e6c20deb0..b45361009f2e 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o
obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o
obj-$(CONFIG_KEYBOARD_MAX7359) += max7359_keypad.o
obj-$(CONFIG_KEYBOARD_MCS) += mcs_touchkey.o
+obj-$(CONFIG_KEYBOARD_MPR121) += mpr121_touchkey.o
obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o
obj-$(CONFIG_KEYBOARD_NOMADIK) += nomadik-ske-keypad.o
obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o