diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-02-06 05:54:05 (GMT) |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-02-06 05:54:05 (GMT) |
commit | 03366e7b9bf1544cb0b98f1a5cd6d340654f486a (patch) | |
tree | b9ca15f0acd86f90fdd62c1ab4b3e8e9b4592fd6 /drivers/input/keyboard/Makefile | |
parent | c18bab80d16f04db3e263cc97522d21693cad2ce (diff) | |
parent | e0f2677f0d21cfff9d45160343e6246417e55d02 (diff) | |
download | linux-fsl-qoriq-03366e7b9bf1544cb0b98f1a5cd6d340654f486a.tar.xz |
Merge branch 'pxa-keypad'
Diffstat (limited to 'drivers/input/keyboard/Makefile')
-rw-r--r-- | drivers/input/keyboard/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 6caa065..e741f40 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -19,7 +19,7 @@ obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o -obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o +obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o |