git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
serio
/
Makefile
diff --git
a/drivers/input/serio/Makefile
b/drivers/input/serio/Makefile
index 2374ef9b33d788cee5693bb52905aabcd965df61..767bd9b6e1ed05861836f0879f4de9ceb08c64c3 100644
(file)
--- a/
drivers/input/serio/Makefile
+++ b/
drivers/input/serio/Makefile
@@
-30,4
+30,5
@@
obj-$(CONFIG_SERIO_APBPS2) += apbps2.o
obj-$(CONFIG_SERIO_OLPC_APSP) += olpc_apsp.o
obj-$(CONFIG_HYPERV_KEYBOARD) += hyperv-keyboard.o
obj-$(CONFIG_SERIO_SUN4I_PS2) += sun4i-ps2.o
+obj-$(CONFIG_SERIO_GPIO_PS2) += ps2-gpio.o
obj-$(CONFIG_USERIO) += userio.o