summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-25 05:37:52 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-25 05:37:52 +0200
commit308f0a5898033691d050374a949bbfe173987a16 (patch)
tree9a7f2798e2f778d6ec126c2f9a1e2c0ba007c742 /drivers/input/serio/Makefile
parentInput: appletouch - add product IDs for the 4th generation MacBooks (diff)
parentInput: wacom - add support for Cintiq 20WSX (diff)
downloadlinux-308f0a5898033691d050374a949bbfe173987a16.tar.xz
linux-308f0a5898033691d050374a949bbfe173987a16.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/input/serio/Makefile')
-rw-r--r--drivers/input/serio/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index 4155197867a3..38b886887cbc 100644
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SERIO_CT82C710) += ct82c710.o
obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o
obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o
obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o
+obj-$(CONFIG_SERIO_AT32PSIF) += at32psif.o
obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o
obj-$(CONFIG_HP_SDC) += hp_sdc.o