Merge branch 'linus' into sched/devel

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

diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
index 5231f6ff75b8a9dc281691ba70ddc67e0bb1f5df..fdbf8c4c2876083686f8fc868427776792f80997 100644 (file)
--- a/drivers/input/joystick/Makefile
+++ b/drivers/input/joystick/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_JOYSTICK_GF2K)           += gf2k.o
 obj-$(CONFIG_JOYSTICK_GRIP)            += grip.o
 obj-$(CONFIG_JOYSTICK_GRIP_MP)         += grip_mp.o
 obj-$(CONFIG_JOYSTICK_GUILLEMOT)       += guillemot.o
+obj-$(CONFIG_JOYSTICK_IFORCE)          += iforce/
 obj-$(CONFIG_JOYSTICK_INTERACT)                += interact.o
 obj-$(CONFIG_JOYSTICK_JOYDUMP)         += joydump.o
 obj-$(CONFIG_JOYSTICK_MAGELLAN)                += magellan.o
@@ -26,5 +27,6 @@ obj-$(CONFIG_JOYSTICK_TMDC)           += tmdc.o
 obj-$(CONFIG_JOYSTICK_TURBOGRAFX)      += turbografx.o
 obj-$(CONFIG_JOYSTICK_TWIDJOY)         += twidjoy.o
 obj-$(CONFIG_JOYSTICK_WARRIOR)         += warrior.o
+obj-$(CONFIG_JOYSTICK_XPAD)            += xpad.o
+obj-$(CONFIG_JOYSTICK_ZHENHUA)         += zhenhua.o
 
-obj-$(CONFIG_JOYSTICK_IFORCE)          += iforce/