[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick Config.help,1.3,1.4 analog.c,1.69,1.70 a3d.c,1.21,NONE adi.c,1.23,NONE amijoy.c,1.13,NONE cobra.c,1.19,NONE db9.c,1.13,NONE gamecon.c,1.22,NONE gf2k.c,1.19,NONE grip.c,1.21,NONE guillemot.c,1.10,NONE interact.c,1.16,NONE magellan.c,1.16,NONE sidewinder.c,1.29,NONE spaceball.c,1.17,NONE spaceorb.c,1.15,NONE stinger.c,1.10,NONE tmdc.c,1.31,NONE turbografx.c,1.14,NONE twidjoy.c,1.5,NONE warrior.c,1.14,NONE

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

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

Modified Files:
	Config.help analog.c 
Removed Files:
	a3d.c adi.c amijoy.c cobra.c db9.c gamecon.c gf2k.c grip.c 
	guillemot.c interact.c magellan.c sidewinder.c spaceball.c 
	spaceorb.c stinger.c tmdc.c turbografx.c twidjoy.c warrior.c 
Log Message:
Syned to 2.5.25

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/Config.help,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.help	6 Jul 2002 17:49:45 -0000	1.3
+++ Config.help	10 Jul 2002 18:08:03 -0000	1.4
@@ -203,3 +203,12 @@
   The module will be called joy-amiga.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
+CONFIG_INPUT_JOYDUMP
+  Say Y here if you want to dump data from your joystick into the system
+  log for debugging purposes. Say N if you are making a production
+  configuration or aren't sure. 
+
+  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 joydump.o. If you want to compile it as
+  a module, say M here and read <file:Documentation/modules.txt>.

Index: analog.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/analog.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- analog.c	25 May 2002 20:32:03 -0000	1.69
+++ analog.c	10 Jul 2002 18:08:03 -0000	1.70
@@ -159,7 +159,7 @@
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"TSC"
 #elif __alpha__
-#define GET_TIME(x)	get_cycles(x)
+#define GET_TIME(x)	do { x = get_cycles(x); } while (0)
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"PCC"
 #else

--- a3d.c DELETED ---

--- adi.c DELETED ---

--- amijoy.c DELETED ---

--- cobra.c DELETED ---

--- db9.c DELETED ---

--- gamecon.c DELETED ---

--- gf2k.c DELETED ---

--- grip.c DELETED ---

--- guillemot.c DELETED ---

--- interact.c DELETED ---

--- magellan.c DELETED ---

--- sidewinder.c DELETED ---

--- spaceball.c DELETED ---

--- spaceorb.c DELETED ---

--- stinger.c DELETED ---

--- tmdc.c DELETED ---

--- turbografx.c DELETED ---

--- twidjoy.c DELETED ---

--- warrior.c DELETED ---