patch-2.1.67 linux/drivers/char/apm_bios.c

• Lines: 29
• Date: Sat Nov 29 10:33:19 1997
• Orig file: v2.1.66/linux/drivers/char/apm_bios.c
• Orig date: Wed Sep 24 20:05:46 1997

diff -u --recursive --new-file v2.1.66/linux/drivers/char/apm_bios.c linux/drivers/char/apm_bios.c
@@ -63,8 +63,8 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/poll.h>
 
+#include <linux/poll.h>
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/timer.h>
@@ -307,7 +307,7 @@
 
 static int	do_open(struct inode *, struct file *);
 static int	do_release(struct inode *, struct file *);
-static long	do_read(struct inode *, struct file *, char *, unsigned long);
+static ssize_t	do_read(struct file *, char *, size_t , loff_t *);
 static unsigned int do_poll(struct file *, poll_table *);
 static int	do_ioctl(struct inode *, struct file *, u_int, u_long);
 
@@ -812,8 +812,7 @@
 	return 0;
 }
 
-static long do_read(struct inode *inode, struct file *fp,
-	char *buf, unsigned long count)
+static ssize_t do_read(struct file *fp, char *buf, size_t count, loff_t *ppos)
 {
 	struct apm_bios_struct *	as;
 	int			i;