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 ec447cd142d9262c0b2508096f30efdfbd17b29e..ae47fffacc6852798d0f094b078cb71d780125fc 100644 (file)
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_KEYBOARD_HP6XX)          += jornada680_kbd.o
 obj-$(CONFIG_KEYBOARD_HP7XX)           += jornada720_kbd.o
 obj-$(CONFIG_KEYBOARD_MAPLE)           += maple_keyb.o
 obj-$(CONFIG_KEYBOARD_BFIN)            += bf54x-keys.o
+obj-$(CONFIG_KEYBOARD_SH_KEYSC)                += sh_keysc.o