Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/master

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

diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
index e855abb0cc5175e0ffc9692e9e3f5b20efb937ef..f3a8cbe2abb69fc69089fb479cfd40b325a441f9 100644 (file)
--- a/drivers/input/joystick/Makefile
+++ b/drivers/input/joystick/Makefile
@@ -15,9 +15,11 @@ 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
+obj-$(CONFIG_JOYSTICK_MAPLE)           += maplecontrol.o
 obj-$(CONFIG_JOYSTICK_SIDEWINDER)      += sidewinder.o
 obj-$(CONFIG_JOYSTICK_SPACEBALL)       += spaceball.o
 obj-$(CONFIG_JOYSTICK_SPACEORB)                += spaceorb.o
@@ -27,5 +29,6 @@ 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_WALKERA0701)     += walkera0701.o
 
-obj-$(CONFIG_JOYSTICK_IFORCE)          += iforce/