joystick modules and 2.1.60

Brian Gerst (bgerst@quark.vpplus.com)
Fri, 31 Oct 1997 14:48:53 -0500

Joystick.c was another casualty with the VFS change. Here is a patch:

--- linux-orig/drivers/char/joystick.c Wed Jul 16 22:22:50 1997
+++ linux/drivers/char/joystick.c Fri Oct 31 14:44:34 1997
@@ -227,12 +227,14 @@
* one shots to clear.
*/

-static long js_read (struct inode *inode, struct file *file, char *buf,
unsigned long count)
+static long js_read (struct file *file, char *buf,
+ size_t count, loff_t *ppos)
{
int j, chk, jsmask;
int t0, t_x0, t_y0, t_x1, t_y1;
unsigned int minor, minor2;
int buttons;
+ struct inode *inode = file->f_dentry->d_inode;

if (count != JS_RETURN)
return -EINVAL;

-- 


						Brian Gerst