patch-2.1.12 linux/arch/m68k/atari/joystick.c

• Lines: 28
• Date: Fri Nov 22 15:56:34 1996
• Orig file: v2.1.11/linux/arch/m68k/atari/joystick.c
• Orig date: Sat Mar 30 14:11:04 1996

diff -u --recursive --new-file v2.1.11/linux/arch/m68k/atari/joystick.c linux/arch/m68k/atari/joystick.c
@@ -14,7 +14,7 @@
 #include <asm/atarikb.h>
 #include <asm/atari_joystick.h>
 #include <asm/atari_mouse.h>
-#include <asm/segment.h>
+#include <asm/uaccess.h>
 
 #define MAJOR_NR    JOYSTICK_MAJOR
 
@@ -79,14 +79,14 @@
     return 0;
 }
 
-static int write_joystick(struct inode *inode, struct file *file,
-			  const char *buffer, int count)
+static long write_joystick(struct inode *inode, struct file *file,
+			   const char *buffer, unsigned long count)
 {
     return -EINVAL;
 }
 
-static int read_joystick(struct inode *inode, struct file *file,
-			 char *buffer, int count)
+static long read_joystick(struct inode *inode, struct file *file,
+			  char *buffer, unsigned long count)
 {
     int minor = DEVICE_NR(inode->i_rdev);
     int i;