diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 11:31:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 11:31:58 +0100 |
commit | cde9efef401563943d5a58eb9b7274bfdc08ca9b (patch) | |
tree | 858a436055612db6282dc63db0fe3ba41147056a /drivers/input/keyboard/Makefile | |
parent | Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx int... (diff) | |
parent | ux500: add TC35893 keypad platform data (diff) | |
download | linux-cde9efef401563943d5a58eb9b7274bfdc08ca9b.tar.xz linux-cde9efef401563943d5a58eb9b7274bfdc08ca9b.zip |
Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable
Diffstat (limited to 'drivers/input/keyboard/Makefile')
-rw-r--r-- | drivers/input/keyboard/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 622de73a445d..2aa6ce248b71 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -41,6 +41,7 @@ obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o obj-$(CONFIG_KEYBOARD_STMPE) += stmpe-keypad.o obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o +obj-$(CONFIG_KEYBOARD_TC3589X) += tc3589x-keypad.o obj-$(CONFIG_KEYBOARD_TNETV107X) += tnetv107x-keypad.o obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o |