[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick/iforce Makefile,1.1,1.2

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

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

Modified Files:
	Makefile 
Log Message:
iforce code compiled into kernel if at least the usb or serial version is "y" and none is "m".


Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	2002/01/23 05:21:35	1.1
+++ Makefile	2002/01/29 23:16:02	1.2
@@ -8,12 +8,16 @@
 
 CONFIG_JOYSTICK_IFORCE := n
 
+# Enable iforce if at least one of iforce-rs232 or iforce-usb is enabled
 ifeq ($(CONFIG_JOYSTICK_IFORCE_232),y)
-	ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y)
-		CONFIG_JOYSTICK_IFORCE := y
-	endif
+	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