Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

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

diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index 38b886887cbc2459aeae5d76c850b3031780061b..9b6c8135955f40ead77feceace47816cf56fe0c9 100644 (file)
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_SERIO_PCIPS2)    += pcips2.o
 obj-$(CONFIG_SERIO_MACEPS2)    += maceps2.o
 obj-$(CONFIG_SERIO_LIBPS2)     += libps2.o
 obj-$(CONFIG_SERIO_RAW)                += serio_raw.o
+obj-$(CONFIG_SERIO_XILINX_XPS_PS2)     += xilinx_ps2.o