patch-2.1.17 linux/drivers/char/atarimouse.c

Next file: linux/drivers/char/fbmem.c
Previous file: linux/drivers/char/amigamouse.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.16/linux/drivers/char/atarimouse.c linux/drivers/char/atarimouse.c
@@ -20,10 +20,10 @@
 #include <linux/mm.h>
 #include <linux/random.h>
 
+#include <asm/setup.h>
 #include <asm/atarikb.h>
 #include <asm/atari_mouse.h>
 #include <asm/uaccess.h>
-#include <asm/bootinfo.h>
 
 static struct mouse_status mouse;
 static int atari_mouse_x_threshold = 2, atari_mouse_y_threshold = 2;
@@ -87,12 +87,14 @@
     return 0;
 }
 
-static int write_mouse(struct inode *inode, struct file *file, const char *buffer, int count)
+static long write_mouse(struct inode *inode, struct file *file,
+			const char *buffer, unsigned long count)
 {
     return -EINVAL;
 }
 
-static int read_mouse(struct inode *inode, struct file *file, char *buffer, int count)
+static long read_mouse(struct inode *inode, struct file *file,
+		       char *buffer, unsigned long count)
 {
     int dx, dy, buttons;
     int r;
@@ -199,7 +201,7 @@
 }
 
 #ifdef MODULE
-#include <asm/bootinfo.h>
+#include <asm/setup.h>
 
 int init_module(void)
 {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov