Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / Makefile

diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index e97455fdcc83af75a458abcfeb74ee22856e8f9d..06956ba66d5ac377f2617eb500a3162758972f1f 100644 (file)
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -18,6 +18,9 @@ obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
 obj-$(CONFIG_KEYBOARD_HIL)             += hil_kbd.o
 obj-$(CONFIG_KEYBOARD_HIL_OLD)         += hilkbd.o
 obj-$(CONFIG_KEYBOARD_OMAP)            += omap-keypad.o
+obj-$(CONFIG_OMAP_PS2)                 += innovator_ps2.o
+obj-$(CONFIG_KEYBOARD_TSC2301)         += tsc2301_kp.o
+obj-$(CONFIG_KEYBOARD_TWL4030)         += omap-twl4030keypad.o
 obj-$(CONFIG_KEYBOARD_PXA27x)          += pxa27x_keyboard.o
 obj-$(CONFIG_KEYBOARD_AAED2000)                += aaed2000_kbd.o
 obj-$(CONFIG_KEYBOARD_GPIO)            += gpio_keys.o