[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick/iforce Config.in,NONE,1.1 Makefile,1.2,1.3

[johann d. <jd...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce
In directory usw-pr-cvs1:/tmp/cvs-serv26165/iforce

Modified Files:
	Makefile 
Added Files:
	Config.in 
Log Message:
Changed the config for the iforce driver. Much less twisted, now.


--- NEW FILE: Config.in ---
#
# I-Force driver configuration
#

dep_tristate 'I-Force devices' CONFIG_JOYSTICK_IFORCE $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK

if [ "$CONFIG_JOYSTICK_IFORCE" != "n" ]; then
	dep_bool '  I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB $CONFIG_USB
	dep_bool '  I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232 $CONFIG_SERIO
fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2002/01/29 23:16:02	1.2
+++ Makefile	2002/01/30 00:08:41	1.3
@@ -4,39 +4,17 @@
 
 O_TARGET := iforce-drv.o
 
-# I-Force may need both USB and RS-232
-
-CONFIG_JOYSTICK_IFORCE := n
-
-# Enable iforce if at least one of iforce-rs232 or iforce-usb is enabled
-ifeq ($(CONFIG_JOYSTICK_IFORCE_232),y)
-	CONFIG_JOYSTICK_IFORCE := y
-endif
-
-ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y)
-	CONFIG_JOYSTICK_IFORCE := y
-endif
-
-# Compile as module if at least one of the choices is m
-ifeq ($(CONFIG_JOYSTICK_IFORCE_232),m)
-	CONFIG_JOYSTICK_IFORCE := m
-endif
-
-ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),m)
-	CONFIG_JOYSTICK_IFORCE := m
-endif
-
 obj-$(CONFIG_JOYSTICK_IFORCE)	+= iforce.o 
 
 include $(TOPDIR)/Rules.make
 
 IFORCEOBJS = iforce-ff.o iforce-main.o iforce-packets.o
 
-ifneq ($(CONFIG_JOYSTICK_IFORCE_232),n)
+ifeq ($(CONFIG_JOYSTICK_IFORCE_232),y)
 	IFORCEOBJS += iforce-serio.o 
 endif
 
-ifneq ($(CONFIG_JOYSTICK_IFORCE_USB),n)
+ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y)
 	IFORCEOBJS += iforce-usb.o 
 endif