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

[James S. <jsi...@us...>]

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

Modified Files:
	Config.help Config.in 
Log Message:
Syned to 2.5.25

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/Config.help,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.help	3 Feb 2002 19:38:21 -0000	1.1
+++ Config.help	10 Jul 2002 18:08:04 -0000	1.2
@@ -1,17 +1,21 @@
-CONFIG_JOYSTICK_IFORCE_USB
+CONFIG_JOYSTICK_IFORCE
   Say Y here if you have an I-Force joystick or steering wheel
-  connected to your USB port. 
+
+  You also must choose at least one of the two options below.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called iforce.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
+CONFIG_JOYSTICK_IFORCE_USB
+  Say Y here if you have an I-Force joystick or steering wheel
+  connected to your USB port. 
+
 CONFIG_JOYSTICK_IFORCE_232
   Say Y here if you have an I-Force joystick or steering wheel
   connected to your serial (COM) port.
 
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called iforce.o. If you want to compile it as a
-  module, say M here and read <file:Documentation/modules.txt>.
+  You will need an additional utility called inputattach, see
+  Documentation/input/joystick.txt and ff.txt.
+

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	17 Apr 2002 19:40:14 -0000	1.3
+++ Config.in	10 Jul 2002 18:08:04 -0000	1.4
@@ -2,11 +2,13 @@
 # I-Force driver configuration
 #
 
-dep_tristate 'I-Force devices' CONFIG_JOYSTICK_IFORCE $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK
+dep_tristate '  I-Force devices' CONFIG_JOYSTICK_IFORCE $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK
 
 if [ "$CONFIG_JOYSTICK_IFORCE" = "m" -o "$CONFIG_JOYSTICK_IFORCE" = "y" ]; then
-	dep_bool '  I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB $CONFIG_USB
-	if [ "$CONFIG_INPUT_SERIO" != "n" -a "$CONFIG_INPUT_SERPORT" != "n" ]; then
-		bool '  I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232
+	if [ "$CONFIG_USB" != "n" ]; then
+		bool '    I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB
+	fi
+	if [ "$CONFIG_SERIO" != "n" ]; then
+		bool '    I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232
 	fi
 fi